Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-30 16:17:56 +02:00
Code Issues Projects Releases Wiki Activity

TinyMCE: add image backgrounds for more and nextpage tags (also jshint fix for theme.js). Fixes #27106

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@27944


git-svn-id: http://core.svn.wordpress.org/trunk@27774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-04-04 05:23:14 +00:00
parent acf9fbc808
commit d4755ebea3
7 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/js/theme.js
View File

@ -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
});

2
wp-admin/js/theme.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/skins/wordpress/images/more-2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 897 B

BIN
wp-includes/js/tinymce/skins/wordpress/images/more.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 462 B

BIN
wp-includes/js/tinymce/skins/wordpress/images/pagebreak-2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 835 B

BIN
wp-includes/js/tinymce/skins/wordpress/images/pagebreak.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

36
wp-includes/js/tinymce/skins/wordpress/wp-content.css
View File

@ -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;
}
}