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 0000000000..7f98c98dda Binary files /dev/null and b/src/wp-includes/js/tinymce/skins/wordpress/images/more-2x.png differ 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 0000000000..3ea7b0075a Binary files /dev/null and b/src/wp-includes/js/tinymce/skins/wordpress/images/more.png differ diff --git a/src/wp-includes/js/tinymce/skins/wordpress/images/pagebreak-2x.png b/src/wp-includes/js/tinymce/skins/wordpress/images/pagebreak-2x.png new file mode 100644 index 0000000000..e5cb33bb4b Binary files /dev/null and b/src/wp-includes/js/tinymce/skins/wordpress/images/pagebreak-2x.png differ 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 0000000000..03d2c3285f Binary files /dev/null and b/src/wp-includes/js/tinymce/skins/wordpress/images/pagebreak.png differ 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; + } +}