<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27193] trunk/src/wp-includes: 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.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27193">27193</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-02-19 03:50:09 +0000 (Wed, 19 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/26952">#26952</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludescsseditorcss">trunk/src/wp-includes/css/editor.css</a></li>
<li><a href="#trunksrcwpincludesimageswpicons2xpng">trunk/src/wp-includes/images/wpicons-2x.png</a></li>
<li><a href="#trunksrcwpincludesimageswpiconspng">trunk/src/wp-includes/images/wpicons.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-editor.php (27192 => 27193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-editor.php 2014-02-18 21:44:14 UTC (rev 27192)
+++ trunk/src/wp-includes/class-wp-editor.php 2014-02-19 03:50:09 UTC (rev 27193)
</span><span class="lines">@@ -324,8 +324,8 @@
</span><span class="cx"> 'keep_styles' => false,
</span><span class="cx"> 'paste_remove_styles' => true,
</span><span class="cx">
</span><del>- // limit the preview styles in the menu/toolbar
- // 'preview_styles' => 'font-family font-weight font-style text-decoration text-transform color background-color border',
</del><ins>+ // Limit the preview styles in the menu/toolbar
+ 'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform',
</ins><span class="cx">
</span><span class="cx"> 'wpeditimage_disable_captions' => $no_captions,
</span><span class="cx"> 'plugins' => implode( ',', $plugins ),
</span></span></pre></div>
<a id="trunksrcwpincludescsseditorcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/editor.css (27192 => 27193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/editor.css 2014-02-18 21:44:14 UTC (rev 27192)
+++ trunk/src/wp-includes/css/editor.css 2014-02-19 03:50:09 UTC (rev 27193)
</span><span class="lines">@@ -17,7 +17,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mce-window {
</span><ins>+ -webkit-border-radius: 0;
</ins><span class="cx"> border-radius: 0;
</span><ins>+ -webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.7);
</ins><span class="cx"> box-shadow: 0 5px 15px rgba(0,0,0,0.7);
</span><span class="cx"> z-index: 160000 !important; /* Overwrite inline style added by TinyMCE. */
</span><span class="cx"> -webkit-font-smoothing: subpixel-antialiased;
</span><span class="lines">@@ -55,22 +57,24 @@
</span><span class="cx"> .mce-window .mce-window-head .mce-close:before {
</span><span class="cx"> font: normal 20px/2 'dashicons';
</span><span class="cx"> text-align: center;
</span><del>- color: #888;
</del><ins>+ color: #666;
</ins><span class="cx"> width: 40px;
</span><span class="cx"> height: 40px;
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mce-window .mce-window-head .mce-close:hover:before {
</span><del>- color: #555;
</del><ins>+ color: #2ea2cc;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mce-window .mce-window-head .mce-dragh {
</span><ins>+ width: -webkit-calc( 100% - 40px );
</ins><span class="cx"> width: calc( 100% - 40px );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mce-textbox {
</span><span class="cx"> border: 1px solid #ddd;
</span><ins>+ -webkit-border-radius: 0;
</ins><span class="cx"> border-radius: 0;
</span><span class="cx"> -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
</span><span class="cx"> box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
</span><span class="lines">@@ -89,7 +93,9 @@
</span><span class="cx"> .mce-menu,
</span><span class="cx"> .mce-floatpanel.mce-popover {
</span><span class="cx"> border-color: rgba(0,0,0,0.15);
</span><ins>+ -webkit-border-radius: 0;
</ins><span class="cx"> border-radius: 0;
</span><ins>+ -webkit-box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
</ins><span class="cx"> box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -153,6 +159,7 @@
</span><span class="cx"> background: transparent;
</span><span class="cx"> -webkit-box-shadow: none;
</span><span class="cx"> box-shadow: none;
</span><ins>+ text-shadow: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #wp-fullscreen-buttons .mce-btn,
</span><span class="lines">@@ -214,6 +221,76 @@
</span><span class="cx"> width: 18px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* 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 */
</ins><span class="cx"> .mce-menubar {
</span><span class="cx"> border-color: #e5e5e5;
</span><span class="cx"> }
</span><span class="lines">@@ -227,7 +304,19 @@
</span><span class="cx"> margin: 5px 0 4px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.mce-menubtn span {
+ margin-right: 0;
+ padding-left: 3px;
+}
+
</ins><span class="cx"> /* Buttons in modals */
</span><ins>+.mce-primary button,
+.mce-primary button i {
+ text-align: center;
+ color: #fff;
+ text-shadow: none;
+}
+
</ins><span class="cx"> .mce-window .mce-btn {
</span><span class="cx"> color: #555;
</span><span class="cx"> background: #f7f7f7;
</span><span class="lines">@@ -335,12 +424,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* TinyMCE tooltips */
</span><del>-
</del><span class="cx"> .mce-tooltip {
</span><span class="cx"> margin-top: 2px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mce-tooltip-inner {
</span><ins>+ -webkit-box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
</ins><span class="cx"> box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
</span><span class="cx"> color: #fff;
</span><span class="cx"> font-size: 12px;
</span><span class="lines">@@ -540,43 +629,6 @@
</span><span class="cx"> content: '\f158';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.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;
-}
-
</del><span class="cx"> /* Editors */
</span><span class="cx"> .wp-editor-wrap {
</span><span class="cx"> position: relative;
</span></span></pre></div>
<a id="trunksrcwpincludesimageswpicons2xpng"></a>
<div class="binary"><h4>Modified: trunk/src/wp-includes/images/wpicons-2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunksrcwpincludesimageswpiconspng"></a>
<div class="binary"><h4>Modified: trunk/src/wp-includes/images/wpicons.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
</div>
</body>
</html>