WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TinyMCE: 

- Tighten up button styles, add :hover for .mce-active buttons.
- Pad only the first toolbar row and remove the padding in both toolbars if the editor doesn't have a DFW mode.
Part props avryl, see #27279
Built from https://develop.svn.wordpress.org/trunk@27978


git-svn-id: http://core.svn.wordpress.org/trunk@27808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-04-07 01:10:15 +00:00
parent 2f80a1c72f
commit 956301ece7
5 changed files with 97 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/class-wp-editor.php
View File

@ -168,7 +168,13 @@ final class _WP_Editors {
$buttons .= '<a id="' . $editor_id . '-tmce" class="wp-switch-editor switch-tmce" onclick="switchEditors.switchto(this);">' . __('Visual') . "</a>\n"; $buttons .= '<a id="' . $editor_id . '-tmce" class="wp-switch-editor switch-tmce" onclick="switchEditors.switchto(this);">' . __('Visual') . "</a>\n";
} }
echo '<div id="wp-' . $editor_id . '-wrap" class="wp-core-ui wp-editor-wrap ' . $switch_class . '">'; $wrap_class = 'wp-core-ui wp-editor-wrap ' . $switch_class;
if ( $set['dfw'] ) {
$wrap_class .= ' has-dfw';
}
echo '<div id="wp-' . $editor_id . '-wrap" class="' . $wrap_class . '">';
if ( self::$editor_buttons_css ) { if ( self::$editor_buttons_css ) {
wp_print_styles('editor-buttons'); wp_print_styles('editor-buttons');

60
wp-includes/css/editor-rtl.css
View File

@ -144,10 +144,14 @@ div.mce-panel {
div.mce-toolbar-grp { div.mce-toolbar-grp {
border-bottom: 1px solid #dedede; border-bottom: 1px solid #dedede;
background: #f5f5f5; background: #f5f5f5;
padding: 3px 3px 3px 35px; padding: 3px;
position: relative; position: relative;
} }
.has-dfw div.mce-toolbar-grp .mce-toolbar.mce-first {
padding-left: 32px;
}
.mce-toolbar .mce-btn-group { .mce-toolbar .mce-btn-group {
margin: 0; margin: 0;
} }
@ -177,8 +181,8 @@ div.mce-path {
border: 1px solid transparent; border: 1px solid transparent;
margin: 2px; margin: 2px;
background-image: none; background-image: none;
-webkit-border-radius: 3px; -webkit-border-radius: 2px;
border-radius: 3px; border-radius: 2px;
-webkit-filter: none; -webkit-filter: none;
filter: none; filter: none;
} }
@ -200,11 +204,18 @@ div.mce-path {
#wp-fullscreen-buttons .mce-btn.mce-active, #wp-fullscreen-buttons .mce-btn.mce-active,
.mce-toolbar .mce-btn-group .mce-btn:active, .mce-toolbar .mce-btn-group .mce-btn:active,
#wp-fullscreen-buttons .mce-btn:active { #wp-fullscreen-buttons .mce-btn:active {
background: #eee; background: #ebebeb;
border-color: #999; border-color: #999;
color: #333; -webkit-box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.3 );
-webkit-box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ); box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.3 );
box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ); }
.mce-toolbar .mce-btn-group .mce-btn.mce-active:hover {
border-color: #555;
}
.mce-toolbar .mce-btn-group .mce-btn.mce-active:hover i.mce-ico {
color: #555;
} }
.mce-toolbar .mce-btn-group .mce-btn.mce-disabled:hover, .mce-toolbar .mce-btn-group .mce-btn.mce-disabled:hover,
@ -243,7 +254,7 @@ div.mce-path {
} }
.mce-toolbar .mce-colorbutton .mce-preview { .mce-toolbar .mce-colorbutton .mce-preview {
margin-right: -16px; margin-right: -17px;
padding: 0; padding: 0;
width: 18px; width: 18px;
} }
@ -266,6 +277,18 @@ div.mce-path {
.mce-panel .mce-btn i.mce-caret { .mce-panel .mce-btn i.mce-caret {
border-top: 6px solid #777; border-top: 6px solid #777;
margin-right: 2px;
margin-left: 2px;
}
.mce-listbox i.mce-caret {
left: 6px;
}
.mce-panel .mce-btn button.mce-open i.mce-caret,
.mce-panel .mce-btn.mce-listbox i.mce-caret {
margin-right: 0;
margin-left: 0;
} }
.mce-panel .mce-btn:hover i.mce-caret { .mce-panel .mce-btn:hover i.mce-caret {
@ -443,6 +466,12 @@ div.mce-menu .mce-menu-item-sep,
text-shadow: 0 -1px 0 rgba(0,0,0,0.1); text-shadow: 0 -1px 0 rgba(0,0,0,0.1);
} }
.mce-menubtn.mce-fixed-width button span {
width: auto;
max-width: 80px;
padding-left: 16px;
}
/* Charmap modal */ /* Charmap modal */
.mce-charmap { .mce-charmap {
margin: 3px; margin: 3px;
@ -738,11 +767,6 @@ i.mce-i-hr:before {
box-shadow: none; box-shadow: none;
} }
.quicktags-toolbar {
border-bottom: 1px solid #dedede;
background: #f5f5f5;
}
.wp-editor-tabs { .wp-editor-tabs {
float: left; float: left;
} }
@ -844,10 +868,14 @@ i.mce-i-hr:before {
/* Quicktags */ /* Quicktags */
.quicktags-toolbar { .quicktags-toolbar {
border-bottom-style: solid; padding: 3px;
border-bottom-width: 1px;
padding: 3px 3px 3px 35px;
position: relative; position: relative;
border-bottom: 1px solid #dedede;
background: #f5f5f5;
}
.has-dfw .quicktags-toolbar {
padding-left: 35px;
} }
.wp-core-ui .quicktags-toolbar input.button.button-small { .wp-core-ui .quicktags-toolbar input.button.button-small {

2
wp-includes/css/editor-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

60
wp-includes/css/editor.css
View File

@ -144,10 +144,14 @@ div.mce-panel {
div.mce-toolbar-grp { div.mce-toolbar-grp {
border-bottom: 1px solid #dedede; border-bottom: 1px solid #dedede;
background: #f5f5f5; background: #f5f5f5;
padding: 3px 35px 3px 3px; padding: 3px;
position: relative; position: relative;
} }
.has-dfw div.mce-toolbar-grp .mce-toolbar.mce-first {
padding-right: 32px;
}
.mce-toolbar .mce-btn-group { .mce-toolbar .mce-btn-group {
margin: 0; margin: 0;
} }
@ -177,8 +181,8 @@ div.mce-path {
border: 1px solid transparent; border: 1px solid transparent;
margin: 2px; margin: 2px;
background-image: none; background-image: none;
-webkit-border-radius: 3px; -webkit-border-radius: 2px;
border-radius: 3px; border-radius: 2px;
-webkit-filter: none; -webkit-filter: none;
filter: none; filter: none;
} }
@ -200,11 +204,18 @@ div.mce-path {
#wp-fullscreen-buttons .mce-btn.mce-active, #wp-fullscreen-buttons .mce-btn.mce-active,
.mce-toolbar .mce-btn-group .mce-btn:active, .mce-toolbar .mce-btn-group .mce-btn:active,
#wp-fullscreen-buttons .mce-btn:active { #wp-fullscreen-buttons .mce-btn:active {
background: #eee; background: #ebebeb;
border-color: #999; border-color: #999;
color: #333; -webkit-box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.3 );
-webkit-box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ); box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.3 );
box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ); }
.mce-toolbar .mce-btn-group .mce-btn.mce-active:hover {
border-color: #555;
}
.mce-toolbar .mce-btn-group .mce-btn.mce-active:hover i.mce-ico {
color: #555;
} }
.mce-toolbar .mce-btn-group .mce-btn.mce-disabled:hover, .mce-toolbar .mce-btn-group .mce-btn.mce-disabled:hover,
@ -243,7 +254,7 @@ div.mce-path {
} }
.mce-toolbar .mce-colorbutton .mce-preview { .mce-toolbar .mce-colorbutton .mce-preview {
margin-left: -16px; margin-left: -17px;
padding: 0; padding: 0;
width: 18px; width: 18px;
} }
@ -266,6 +277,18 @@ div.mce-path {
.mce-panel .mce-btn i.mce-caret { .mce-panel .mce-btn i.mce-caret {
border-top: 6px solid #777; border-top: 6px solid #777;
margin-left: 2px;
margin-right: 2px;
}
.mce-listbox i.mce-caret {
right: 6px;
}
.mce-panel .mce-btn button.mce-open i.mce-caret,
.mce-panel .mce-btn.mce-listbox i.mce-caret {
margin-left: 0;
margin-right: 0;
} }
.mce-panel .mce-btn:hover i.mce-caret { .mce-panel .mce-btn:hover i.mce-caret {
@ -443,6 +466,12 @@ div.mce-menu .mce-menu-item-sep,
text-shadow: 0 -1px 0 rgba(0,0,0,0.1); text-shadow: 0 -1px 0 rgba(0,0,0,0.1);
} }
.mce-menubtn.mce-fixed-width button span {
width: auto;
max-width: 80px;
padding-right: 16px;
}
/* Charmap modal */ /* Charmap modal */
.mce-charmap { .mce-charmap {
margin: 3px; margin: 3px;
@ -738,11 +767,6 @@ i.mce-i-hr:before {
box-shadow: none; box-shadow: none;
} }
.quicktags-toolbar {
border-bottom: 1px solid #dedede;
background: #f5f5f5;
}
.wp-editor-tabs { .wp-editor-tabs {
float: right; float: right;
} }
@ -844,10 +868,14 @@ i.mce-i-hr:before {
/* Quicktags */ /* Quicktags */
.quicktags-toolbar { .quicktags-toolbar {
border-bottom-style: solid; padding: 3px;
border-bottom-width: 1px;
padding: 3px 35px 3px 3px;
position: relative; position: relative;
border-bottom: 1px solid #dedede;
background: #f5f5f5;
}
.has-dfw .quicktags-toolbar {
padding-right: 35px;
} }
.wp-core-ui .quicktags-toolbar input.button.button-small { .wp-core-ui .quicktags-toolbar input.button.button-small {

2
wp-includes/css/editor.min.css vendored
View File

File diff suppressed because one or more lines are too long