From 48269a7c297ffc7cb33c6b0606eb22e946b583f0 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Fri, 4 Apr 2014 05:22:47 +0000 Subject: [PATCH] TinyMCE: add image backgrounds for more and nextpage tags (also jshint fix for theme.js). Fixes #27106 git-svn-id: https://develop.svn.wordpress.org/trunk@27944 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/js/theme.js | 4 +- .../skins/wordpress/images/more-2x.png | Bin 0 -> 897 bytes .../tinymce/skins/wordpress/images/more.png | Bin 0 -> 462 bytes .../skins/wordpress/images/pagebreak-2x.png | Bin 0 -> 835 bytes .../skins/wordpress/images/pagebreak.png | Bin 0 -> 1203 bytes .../js/tinymce/skins/wordpress/wp-content.css | 36 ++++++++++++------ 6 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 src/wp-includes/js/tinymce/skins/wordpress/images/more-2x.png create mode 100644 src/wp-includes/js/tinymce/skins/wordpress/images/more.png create mode 100644 src/wp-includes/js/tinymce/skins/wordpress/images/pagebreak-2x.png create mode 100644 src/wp-includes/js/tinymce/skins/wordpress/images/pagebreak.png diff --git a/src/wp-admin/js/theme.js b/src/wp-admin/js/theme.js index 9f5dc3821a..ab6b0bee89 100644 --- a/src/wp-admin/js/theme.js +++ b/src/wp-admin/js/theme.js @@ -453,7 +453,7 @@ themes.view.Theme = wp.Backbone.View.extend({ preview: function( event ) { var self = this, - current; + current, preview; // Bail if the user scrolled on a touch device if ( this.touchDrag === true ) { @@ -478,7 +478,7 @@ themes.view.Theme = wp.Backbone.View.extend({ themes.focusedTheme = this.$el; // Construct a new Preview view. - var preview = new themes.view.Preview({ + preview = new themes.view.Preview({ model: this.model }); diff --git a/src/wp-includes/js/tinymce/skins/wordpress/images/more-2x.png b/src/wp-includes/js/tinymce/skins/wordpress/images/more-2x.png new file mode 100644 index 0000000000000000000000000000000000000000..7f98c98dda5a2beb4e8a76897dfc0955510dc683 GIT binary patch literal 897 zcmeAS@N?(olHy`uVBq!ia0y~y;JX22Yj7|F$)8g14*)5T0G|-o>({T}zJ2@d-MbGT zK78`z$%_{+UcP+!;lqa?KYslF{rm6VzyJRI`~Uy{#fuj&T)1%d?Aa41P8>ge{K%0b zyLa#2vuDq~eftg^IB@XbL088e9zZjNOM?7@fiwd6MAq*=^LhH&C&~;AOjkW!978H@ zy}f(4?2>~-+rRJTmD?N$tt1e)_NajG|v zYS_REBon!T#33;hR*No>%MlGEV5}eV_dS#!{W7tw+UIhlvTBNwk`mwR>uzh}4Ea}! zGlKO0E4y*5aPlVA=+|}Yu07V4)y`pbxWRNl@6fi{a$CJ`EbE9bd2?eIP$AIBHwroH zFU~*4epcZAZ^N9~iC%ZI?r!{iX)QYgNXz3x+x}bC-M5t78vEg2>;D-`;J@B@!sV?yCYQJ{ou^qTJ=r=5@CIZ%zVFEwdVT0o*gao zX<72+BD2chT;PaFKD15p)W=7bImLI+U;TA?@1j$QDL~VJmX-knNjG;^*z)enzMJ(D pqpc#q5duwAq$D&3h9AOp432YF9-7{{R0e1OgQu&X%Q~loCIE*}r@R0F literal 0 HcmV?d00001 diff --git a/src/wp-includes/js/tinymce/skins/wordpress/images/more.png b/src/wp-includes/js/tinymce/skins/wordpress/images/more.png new file mode 100644 index 0000000000000000000000000000000000000000..3ea7b0075a61100b60deff3e6d4e718b3759e47a GIT binary patch literal 462 zcmeAS@N?(olHy`uVBq!ia0y~yV9x=vML3v&WZ5U%3qZ;vz$e7@{{R2){sRG&z69jF zyL1xByMJ;w2prtK`{eF}mv)~7qWeJ3!ILKsUU~F!Z*LzgYBCUU2s{uWyf7m3;Q#-ZCtWC8 zwrk5d2ix??>ee@7JeP1W9B>ZJV`S*i1tEoPKy;w@?u>JldzY-^Q(Sg)VT|v~9r4#{ z7zLsq^xb%N%FH=VZ|Ca5b?@`uIM2AXYE8oprte3;y`92+yRM|vc*>SK_isgax^+8r zKd^6nyZn#HZU5N6MOxOU3OnEAy~*0x%6rsI^z?G|8S~$~o@H*Mzp*#>>Yn%BIj3Ld z__P;=-L9W|cbmQajJxKazdd{Yb6Zlj*?OyOXA3%FYd@!0zgKHttsedTtj@OVKHUwE za-SIN?R#zzJOAdhFSp#f*UOW{ZKJd8tU-I(ufOx&%G{hD{N6TN nAezA;hY^ApHnIXyL;XA9V|Qw z0008YNklI78{{BHPP6Ai&R z(rZ~f=)jV7RpoLy0RR910000000000000000002sKO3rQ>_?A}=H9uts?JGLRki!2 z*ZvMul1&|)PXKrswslF8eb36Fs_OJ3Y-{deThC#;s?$Aem&xe_fHz?~C&|(>cU?V5 zzlUw@de}bqwr#{aOv&27764v`?Ud{*N$Rhu4RFU~b?Kwk$CoyBNotqW>8UsT)25ZD zWIsEb0PrSkS9M6%=k1)dEWLN053fCJhx1eKcv)`!3vFNw0K5p>)FIiNR+VI3w>M$C z^swDNhwb&SAKMr1>#G2O*I_%1sa>+Eyc^lxTG(!$!?xPtF!g200KluTUDqx-Ub5WU zB=O6z-PW#8BhQcC`kd{YWSBMvw(yavlv4j^-E;IRm3ahMFJuY@J)BgsoEQd)VHd@^qN*Vf*Vn+f|KE+ci#K zx!O0mIOjMETctkqItM;sHFA=DwIOa>=(PPAw%Jcf?XrxIU#;qEYsaZApaKBihV4>q zljOGP;;XP7PD$FJR@HqJ?Aadx_-)wMEy;0gi;Z7~?Xit)S9Q4ehB?W)Y}W_? ze-7JKyA^xt?<3g0yJx#gmhs-(Pf1dT{vfUw5dgsZux+<$H!oO*BFo+}vU_Fo?FFaQ7m00000000000000000000008(z{{lIxlDr8>t@Z!_ N002ovPDHLkV1i2Ko^1dC literal 0 HcmV?d00001 diff --git a/src/wp-includes/js/tinymce/skins/wordpress/images/pagebreak.png b/src/wp-includes/js/tinymce/skins/wordpress/images/pagebreak.png new file mode 100644 index 0000000000000000000000000000000000000000..03d2c3285fa6885edf6168b98e2128d8558a222d GIT binary patch literal 1203 zcmV;k1WfyhP)m>zg000DfNklC^EN5rZLc!36^n!34L(DNI=`?8W$cg)vMdAjT_Ed?Aq~#0{KbyFkDY zuLvY)P@`O^!AMWnc4NdcUEJ7+nF$yYy+A_7OJ+CL_IUAhYqvII*Yf?`{MwWAKW%z0 zPX2xRR00410000000000000000000000000008pXqN5!%s*Oyu!rfk_myaF*fEfw$ z5dZ*?Z7ug}w$9BWv#LYF7ztkoe^Nk-bG1GySWt@VvlSCRrv+9%b^ zI!SU09<6y}@{IAiiuvK2C3eHp<13UrUQs7Wk>6B$|Aw`6xc~sr*a84>S0jPJ^cQm8 zJMMhQ_(Q3N;En6=X@~#p?1|(SlTfqdEggL@p{i_+@g&8ku4Ftto7&rX@u^diQ}A$l z$RyKkvC<9oDyZvH?_0qeWA)B6X@3O`OVZiTM=KVV>I$0!0050G001-K4c4~w=;4E1 z!`<809FyWL8O`3DJnc8OiOO4BX19mx3Tuk5Bx!HNjjq-yNm}yh%F9+pskUNu)oO3? zw(FBkq0In8bjHRe|GN5?exl_yU5BY(ebhm>?}vySG^@av+wRa^3d^vIzL&3!A% zFG*7Rp}_A(wHGJ9Mb2%KBuSDiOn!;0>( zS#@f1GE$=?dByIr&5o8VO`bgS$Ksv}8Krg_Io;R1Zg2h!zph5MEfu#-7ei9PQd2A@`th3I#uUVGj)a}o!gpwrD%5Dj&G!BS=e zk|arzGd|A&0Jyim?48tXUVR|!&Oh%zj&{Yqmn7@jFWJW?H@1_T;mIwso7L{3NBqWi zaJh7CzIB~%Mhfa;$6|l^kGfZfUEhk_dx?J;alOmg8vp>N6W}8N0H9Ep`gR1h_H_2R zjE}wOyr@)`S?+$Z&bn0V_{`Cb{&U=CiD~A0{{R300000000000000000000000000000000906{sZJ6a*9}1 R4A=kw002ovPDHLkV1kn(LxKPR literal 0 HcmV?d00001 diff --git a/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css b/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css index 4b511dded3..fac7370244 100644 --- a/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css +++ b/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css @@ -80,6 +80,11 @@ td { margin: 8px; } +/* Remove blue highlighting of selected images in WebKit */ +img::selection { + background-color: transparent; +} + /* Styles for the WordPress plugins */ .mce-content-body img[data-mce-placeholder] { border-radius: 0; @@ -91,32 +96,25 @@ td { border: 0; -webkit-box-shadow: none; box-shadow: none; - width: 95%; - height: 10px; + width: 96%; + height: 16px; display: block; margin: 15px auto 0; outline: 0; cursor: default; } -/* Remove blue highlighting of selected images in WebKit */ -img::selection { - background-color: transparent; -} - .mce-content-body img.mce-wp-nextpage[data-mce-selected], .mce-content-body img.mce-wp-more[data-mce-selected] { - background-color: rgba(128,128,128,0.2); outline: 1px dotted #888; - border-color: transparent; } .mce-content-body img.mce-wp-more { - border-top: 2px dashed #bbb; + background: transparent url( images/more.png ) repeat-y scroll center center; } .mce-content-body img.mce-wp-nextpage { - border-top: 3px dotted #bbb; + background: transparent url( images/pagebreak.png ) repeat-y scroll center center; } /* Gallery, audio, video placeholders */ @@ -420,3 +418,19 @@ img.wp-oembed { height: 250px; outline: 0; } + +@media print, + (-o-min-device-pixel-ratio: 5/4), + (-webkit-min-device-pixel-ratio: 1.25), + (min-resolution: 120dpi) { + + .mce-content-body img.mce-wp-more { + background-image: url( images/more-2x.png ); + background-size: 1900px 20px; + } + + .mce-content-body img.mce-wp-nextpage { + background-image: url( images/pagebreak-2x.png ); + background-size: 1900px 20px; + } +}