TinyMCE: revert style for the blocks drop-down in the toolbar, limit the styles imported for the same drop-down, make the menu highlight color grey. Part props avryl, see #26952

Built from https://develop.svn.wordpress.org/trunk@27193


git-svn-id: http://core.svn.wordpress.org/trunk@27052 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-02-19 03:51:15 +00:00
parent 777699e837
commit 9c77339681
7 changed files with 188 additions and 84 deletions

View File

@ -324,8 +324,8 @@ final class _WP_Editors {
'keep_styles' => false,
'paste_remove_styles' => true,
// limit the preview styles in the menu/toolbar
// 'preview_styles' => 'font-family font-weight font-style text-decoration text-transform color background-color border',
// Limit the preview styles in the menu/toolbar
'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform',
'wpeditimage_disable_captions' => $no_captions,
'plugins' => implode( ',', $plugins ),

View File

@ -17,7 +17,9 @@
}
.mce-window {
-webkit-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.7);
box-shadow: 0 5px 15px rgba(0,0,0,0.7);
z-index: 160000 !important; /* Overwrite inline style added by TinyMCE. */
-webkit-font-smoothing: subpixel-antialiased;
@ -55,22 +57,24 @@
.mce-window .mce-window-head .mce-close:before {
font: normal 20px/2 'dashicons';
text-align: center;
color: #888;
color: #666;
width: 40px;
height: 40px;
display: block;
}
.mce-window .mce-window-head .mce-close:hover:before {
color: #555;
color: #2ea2cc;
}
.mce-window .mce-window-head .mce-dragh {
width: -webkit-calc( 100% - 40px );
width: calc( 100% - 40px );
}
.mce-textbox {
border: 1px solid #ddd;
-webkit-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
@ -89,7 +93,9 @@
.mce-menu,
.mce-floatpanel.mce-popover {
border-color: rgba(0,0,0,0.15);
-webkit-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
}
@ -153,6 +159,7 @@ div.mce-statusbar {
background: transparent;
-webkit-box-shadow: none;
box-shadow: none;
text-shadow: none;
}
#wp-fullscreen-buttons .mce-btn,
@ -214,6 +221,76 @@ div.mce-statusbar {
width: 18px;
}
/* mce listbox */
.mce-toolbar .mce-btn-group .mce-btn.mce-listbox {
-webkit-border-radius: 0;
border-radius: 0;
direction: rtl;
background: #fff;
border: 1px solid #ddd;
-webkit-box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .2);
box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .2);
}
.mce-toolbar .mce-btn-group .mce-btn.mce-listbox:hover {
background-image: none;
border-color: #bbb;
}
.mce-toolbar .mce-btn .mce-caret {
border: none;
margin: 0 -5px 0 0;
width: 16px;
}
.mce-toolbar .mce-listbox .mce-caret {
margin-top: 0;
padding: 2px 0 0;
left: 0;
top: 0;
width: 16px;
}
.mce-toolbar .mce-listbox .mce-caret:before {
margin-right: -6px;
}
.mce-toolbar .mce-splitbtn:hover .mce-open {
border-left-color: transparent;
}
.mce-toolbar .mce-splitbtn .mce-open.mce-active{
-webkit-box-shadow: none;
box-shadow: none;
}
.mce-menu .mce-menu-item-normal.mce-active {
background-color: #e5e5e5;
-webkit-filter: none;
filter: none;
}
.mce-menu .mce-menu-item:hover,
.mce-menu .mce-menu-item.mce-selected,
.mce-menu .mce-menu-item:focus {
color: #000;
background-color: #bbb;
background-image: none;
-webkit-filter: none;
filter: none;
}
.mce-menu .mce-menu-item:hover .mce-ico,
.mce-menu .mce-menu-item.mce-selected .mce-ico,
.mce-menu .mce-menu-item:focus .mce-ico,
.mce-menu .mce-menu-item:hover .mce-text,
.mce-menu .mce-menu-item.mce-active:hover .mce-text,
.mce-menu .mce-menu-item.mce-selected .mce-text {
color: #000;
}
/* Menubar */
.mce-menubar {
border-color: #e5e5e5;
}
@ -227,7 +304,19 @@ div.mce-menu .mce-menu-item-sep,
margin: 5px 0 4px;
}
.mce-menubtn span {
margin-left: 0;
padding-right: 3px;
}
/* Buttons in modals */
.mce-primary button,
.mce-primary button i {
text-align: center;
color: #fff;
text-shadow: none;
}
.mce-window .mce-btn {
color: #555;
background: #f7f7f7;
@ -335,12 +424,12 @@ div.mce-menu .mce-menu-item-sep,
}
/* TinyMCE tooltips */
.mce-tooltip {
margin-top: 2px;
}
.mce-tooltip-inner {
-webkit-box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
color: #fff;
font-size: 12px;
@ -540,43 +629,6 @@ i.mce-caret:before {
content: '\f158';
}
.mce-toolbar .mce-btn .mce-caret {
border: none;
margin: 0 -5px 0 0;
width: 16px;
}
.mce-menubtn span {
margin-left: 0;
padding-right: 3px;
}
.mce-toolbar .mce-listbox .mce-caret {
margin-top: 0;
padding: 2px 3px;
left: 0;
top: 0;
width: 10px;
}
.mce-toolbar .mce-listbox:hover .mce-caret,
.mce-toolbar .mce-listbox.mce-active .mce-caret {
border-right: 1px solid #bdbdbd;
}
.mce-toolbar .mce-listbox .mce-caret:before {
margin-right: -6px;
}
.mce-toolbar .mce-splitbtn:hover .mce-open {
border-left-color: transparent;
}
.mce-toolbar .mce-splitbtn .mce-open.mce-active{
-webkit-box-shadow: none;
box-shadow: none;
}
/* Editors */
.wp-editor-wrap {
position: relative;

File diff suppressed because one or more lines are too long

View File

@ -17,7 +17,9 @@
}
.mce-window {
-webkit-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.7);
box-shadow: 0 5px 15px rgba(0,0,0,0.7);
z-index: 160000 !important; /* Overwrite inline style added by TinyMCE. */
-webkit-font-smoothing: subpixel-antialiased;
@ -55,22 +57,24 @@
.mce-window .mce-window-head .mce-close:before {
font: normal 20px/2 'dashicons';
text-align: center;
color: #888;
color: #666;
width: 40px;
height: 40px;
display: block;
}
.mce-window .mce-window-head .mce-close:hover:before {
color: #555;
color: #2ea2cc;
}
.mce-window .mce-window-head .mce-dragh {
width: -webkit-calc( 100% - 40px );
width: calc( 100% - 40px );
}
.mce-textbox {
border: 1px solid #ddd;
-webkit-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
@ -89,7 +93,9 @@
.mce-menu,
.mce-floatpanel.mce-popover {
border-color: rgba(0,0,0,0.15);
-webkit-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
}
@ -153,6 +159,7 @@ div.mce-statusbar {
background: transparent;
-webkit-box-shadow: none;
box-shadow: none;
text-shadow: none;
}
#wp-fullscreen-buttons .mce-btn,
@ -214,6 +221,76 @@ div.mce-statusbar {
width: 18px;
}
/* mce listbox */
.mce-toolbar .mce-btn-group .mce-btn.mce-listbox {
-webkit-border-radius: 0;
border-radius: 0;
direction: ltr;
background: #fff;
border: 1px solid #ddd;
-webkit-box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .2);
box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .2);
}
.mce-toolbar .mce-btn-group .mce-btn.mce-listbox:hover {
background-image: none;
border-color: #bbb;
}
.mce-toolbar .mce-btn .mce-caret {
border: none;
margin: 0 0 0 -5px;
width: 16px;
}
.mce-toolbar .mce-listbox .mce-caret {
margin-top: 0;
padding: 2px 0 0;
right: 0;
top: 0;
width: 16px;
}
.mce-toolbar .mce-listbox .mce-caret:before {
margin-left: -6px;
}
.mce-toolbar .mce-splitbtn:hover .mce-open {
border-right-color: transparent;
}
.mce-toolbar .mce-splitbtn .mce-open.mce-active{
-webkit-box-shadow: none;
box-shadow: none;
}
.mce-menu .mce-menu-item-normal.mce-active {
background-color: #e5e5e5;
-webkit-filter: none;
filter: none;
}
.mce-menu .mce-menu-item:hover,
.mce-menu .mce-menu-item.mce-selected,
.mce-menu .mce-menu-item:focus {
color: #000;
background-color: #bbb;
background-image: none;
-webkit-filter: none;
filter: none;
}
.mce-menu .mce-menu-item:hover .mce-ico,
.mce-menu .mce-menu-item.mce-selected .mce-ico,
.mce-menu .mce-menu-item:focus .mce-ico,
.mce-menu .mce-menu-item:hover .mce-text,
.mce-menu .mce-menu-item.mce-active:hover .mce-text,
.mce-menu .mce-menu-item.mce-selected .mce-text {
color: #000;
}
/* Menubar */
.mce-menubar {
border-color: #e5e5e5;
}
@ -227,7 +304,19 @@ div.mce-menu .mce-menu-item-sep,
margin: 5px 0 4px;
}
.mce-menubtn span {
margin-right: 0;
padding-left: 3px;
}
/* Buttons in modals */
.mce-primary button,
.mce-primary button i {
text-align: center;
color: #fff;
text-shadow: none;
}
.mce-window .mce-btn {
color: #555;
background: #f7f7f7;
@ -335,12 +424,12 @@ div.mce-menu .mce-menu-item-sep,
}
/* TinyMCE tooltips */
.mce-tooltip {
margin-top: 2px;
}
.mce-tooltip-inner {
-webkit-box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
color: #fff;
font-size: 12px;
@ -540,43 +629,6 @@ i.mce-caret:before {
content: '\f158';
}
.mce-toolbar .mce-btn .mce-caret {
border: none;
margin: 0 0 0 -5px;
width: 16px;
}
.mce-menubtn span {
margin-right: 0;
padding-left: 3px;
}
.mce-toolbar .mce-listbox .mce-caret {
margin-top: 0;
padding: 2px 3px;
right: 0;
top: 0;
width: 10px;
}
.mce-toolbar .mce-listbox:hover .mce-caret,
.mce-toolbar .mce-listbox.mce-active .mce-caret {
border-left: 1px solid #bdbdbd;
}
.mce-toolbar .mce-listbox .mce-caret:before {
margin-left: -6px;
}
.mce-toolbar .mce-splitbtn:hover .mce-open {
border-right-color: transparent;
}
.mce-toolbar .mce-splitbtn .mce-open.mce-active{
-webkit-box-shadow: none;
box-shadow: none;
}
/* Editors */
.wp-editor-wrap {
position: relative;

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB