<!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>[27857] trunk/src: Editor:</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/27857">27857</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-03-29 23:57:13 +0000 (Sat, 29 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Editor:
- Use standard button styles for the Quicktags buttons.
- Better style for the TinyMCE buttons (hover/focus/active/disabled).
- Move the fullscreen (DFW) button to the right.
- Better style for the Visual/Text buttons in DFW.
Props avryl, see <a href="http://core.trac.wordpress.org/ticket/27279">#27279</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjswpfullscreenjs">trunk/src/wp-admin/js/wp-fullscreen.js</a></li>
<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="#trunksrcwpincludesjsquicktagsjs">trunk/src/wp-includes/js/quicktags.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpfullscreenpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js</a></li>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjswpfullscreenjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/wp-fullscreen.js (27856 => 27857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/wp-fullscreen.js 2014-03-29 23:18:54 UTC (rev 27856)
+++ trunk/src/wp-admin/js/wp-fullscreen.js 2014-03-29 23:57:13 UTC (rev 27857)
</span><span class="lines">@@ -439,7 +439,8 @@
</span><span class="cx">
</span><span class="cx"> api.refreshButtons = function( fade ) {
</span><span class="cx"> if ( s.mode === 'html' ) {
</span><del>- $('#wp-fullscreen-mode-bar').removeClass('wp-tmce-mode').addClass('wp-html-mode');
</del><ins>+ $('#wp-fullscreen-mode-bar').removeClass('wp-tmce-mode').addClass('wp-html-mode')
+ .find('a').removeClass( 'active' ).filter('.wp-fullscreen-mode-html').addClass( 'active' );
</ins><span class="cx">
</span><span class="cx"> if ( fade ) {
</span><span class="cx"> $('#wp-fullscreen-button-bar').fadeOut( 150, function(){
</span><span class="lines">@@ -449,7 +450,8 @@
</span><span class="cx"> $('#wp-fullscreen-button-bar').addClass('wp-html-mode');
</span><span class="cx"> }
</span><span class="cx"> } else if ( s.mode === 'tinymce' ) {
</span><del>- $('#wp-fullscreen-mode-bar').removeClass('wp-html-mode').addClass('wp-tmce-mode');
</del><ins>+ $('#wp-fullscreen-mode-bar').removeClass('wp-html-mode').addClass('wp-tmce-mode')
+ .find('a').removeClass( 'active' ).filter('.wp-fullscreen-mode-tinymce').addClass( 'active' );
</ins><span class="cx">
</span><span class="cx"> if ( fade ) {
</span><span class="cx"> $('#wp-fullscreen-button-bar').fadeOut( 150, function(){
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-editor.php (27856 => 27857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-editor.php 2014-03-29 23:18:54 UTC (rev 27856)
+++ trunk/src/wp-includes/class-wp-editor.php 2014-03-29 23:57:13 UTC (rev 27857)
</span><span class="lines">@@ -669,8 +669,10 @@
</span><span class="cx"> if ( self::$has_tinymce )
</span><span class="cx"> wp_enqueue_script('editor');
</span><span class="cx">
</span><del>- if ( self::$has_quicktags )
- wp_enqueue_script('quicktags');
</del><ins>+ if ( self::$has_quicktags ) {
+ wp_enqueue_script( 'quicktags' );
+ wp_enqueue_style( 'buttons' );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( in_array('wplink', self::$plugins, true) || in_array('link', self::$qt_buttons, true) ) {
</span><span class="cx"> wp_enqueue_script('wplink');
</span><span class="lines">@@ -1115,10 +1117,12 @@
</span><span class="cx"> <div id="wp-fullscreen-close"><a href="#" onclick="wp.editor.fullscreen.off();return false;"><?php _e('Exit fullscreen'); ?></a></div>
</span><span class="cx"> <div id="wp-fullscreen-central-toolbar" style="width:<?php echo $width; ?>px;">
</span><span class="cx">
</span><del>- <div id="wp-fullscreen-mode-bar"><div id="wp-fullscreen-modes">
- <a href="#" onclick="wp.editor.fullscreen.switchmode('tinymce');return false;"><?php _e( 'Visual' ); ?></a>
- <a href="#" onclick="wp.editor.fullscreen.switchmode('html');return false;"><?php _ex( 'Text', 'Name for the Text editor tab (formerly HTML)' ); ?></a>
- </div></div>
</del><ins>+ <div id="wp-fullscreen-mode-bar">
+ <div id="wp-fullscreen-modes" class="button-group">
+ <a class="button wp-fullscreen-mode-tinymce" href="#" onclick="wp.editor.fullscreen.switchmode( 'tinymce' ); return false;"><?php _e( 'Visual' ); ?></a>
+ <a class="button wp-fullscreen-mode-html" href="#" onclick="wp.editor.fullscreen.switchmode( 'html' ); return false;"><?php _ex( 'Text', 'Name for the Text editor tab (formerly HTML)' ); ?></a>
+ </div>
+ </div>
</ins><span class="cx">
</span><span class="cx"> <div id="wp-fullscreen-button-bar"><div id="wp-fullscreen-buttons" class="mce-toolbar">
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunksrcwpincludescsseditorcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/editor.css (27856 => 27857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/editor.css 2014-03-29 23:18:54 UTC (rev 27856)
+++ trunk/src/wp-includes/css/editor.css 2014-03-29 23:57:13 UTC (rev 27857)
</span><span class="lines">@@ -144,10 +144,12 @@
</span><span class="cx"> div.mce-toolbar-grp {
</span><span class="cx"> border-bottom: 1px solid #dedede;
</span><span class="cx"> background: #f5f5f5;
</span><ins>+ padding: 3px 35px 3px 3px;
+ position: relative;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-toolbar {
- padding: 1px 3px;
</del><ins>+.mce-toolbar .mce-btn-group {
+ margin: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div.mce-statusbar {
</span><span class="lines">@@ -159,48 +161,62 @@
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-toolbar .mce-btn {
</del><ins>+.mce-toolbar .mce-btn,
+.qt-fullscreen {
</ins><span class="cx"> border-color: transparent;
</span><span class="cx"> background: transparent;
</span><span class="cx"> -webkit-box-shadow: none;
</span><span class="cx"> box-shadow: none;
</span><span class="cx"> text-shadow: none;
</span><ins>+ cursor: pointer;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #wp-fullscreen-buttons .mce-btn,
</span><del>-.mce-toolbar .mce-btn-group .mce-btn {
</del><ins>+.mce-toolbar .mce-btn-group .mce-btn,
+.qt-fullscreen {
</ins><span class="cx"> border: 1px solid transparent;
</span><del>- margin: 0 1px;
- -webkit-border-radius: 2px;
- border-radius: 2px;
</del><ins>+ margin: 2px;
+ background-image: none;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
</ins><span class="cx"> -webkit-filter: none;
</span><span class="cx"> filter: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #wp-fullscreen-buttons .mce-btn:hover,
</span><del>-.mce-toolbar .mce-btn-group .mce-btn:hover {
- -webkit-box-shadow: 0 0 transparent;
- box-shadow: 0 0 transparent;
- border-color: #bbb;
- background: #eee;
- background-image: -webkit-gradient(linear, left bottom, left top, from(#e5e5e5), to(#fff));
- background-image: -webkit-linear-gradient(bottom, #e5e5e5, #fff);
- background-image: linear-gradient(to top, #e5e5e5, #fff);
</del><ins>+.mce-toolbar .mce-btn-group .mce-btn:hover,
+#wp-fullscreen-buttons .mce-btn:focus,
+.mce-toolbar .mce-btn-group .mce-btn:focus,
+.qt-fullscreen:hover,
+.qt-fullscreen:focus {
+ background: #fafafa;
+ border-color: #999;
+ color: #222;
+ -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 0 rgba( 0, 0, 0, 0.08 );
+ box-shadow: inset 0 1px 0 #fff, 0 1px 0 rgba( 0, 0, 0, 0.08 );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-toolbar .mce-btn-group .mce-btn.mce-active {
- -webkit-box-shadow: 0 0 transparent;
- box-shadow: 0 0 transparent;
- border-color: #bbb;
</del><ins>+.mce-toolbar .mce-btn-group .mce-btn.mce-active,
+#wp-fullscreen-buttons .mce-btn.mce-active,
+.mce-toolbar .mce-btn-group .mce-btn:active,
+#wp-fullscreen-buttons .mce-btn:active {
</ins><span class="cx"> background: #eee;
</span><del>- background-image: -webkit-gradient(linear, left bottom, left top, from(#f6f6f6), to(#e3e3e3));
- background-image: -webkit-linear-gradient(bottom, #f6f6f6, #e3e3e3);
- background-image: linear-gradient(to top, #f6f6f6, #e3e3e3);
</del><ins>+ border-color: #999;
+ color: #333;
+ -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.5 );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-toolbar .mce-btn-group .mce-disabled.mce-btn:hover {
- border-color: transparent;
- background: transparent;
</del><ins>+.mce-toolbar .mce-btn-group .mce-btn.mce-disabled:hover,
+#wp-fullscreen-buttons .mce-btn.mce-disabled:hover,
+.mce-toolbar .mce-btn-group .mce-btn.mce-disabled:focus,
+#wp-fullscreen-buttons .mce-btn.mce-disabled:focus {
+ color: #aaa;
+ background: none;
+ border-color: #ddd;
+ text-shadow: 0 1px 0 #fff;
+ -webkit-box-shadow: none;
+ box-shadow: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mce-toolbar .mce-btn-group .mce-first,
</span><span class="lines">@@ -208,7 +224,8 @@
</span><span class="cx"> border-color: transparent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-toolbar .mce-btn button {
</del><ins>+.mce-toolbar .mce-btn button,
+.qt-fullscreen {
</ins><span class="cx"> padding: 2px 3px;
</span><span class="cx"> line-height: normal;
</span><span class="cx"> }
</span><span class="lines">@@ -217,10 +234,6 @@
</span><span class="cx"> text-shadow: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-toolbar .mce-btn:focus {
- outline: 1px solid #888;
-}
-
</del><span class="cx"> .mce-toolbar .mce-btn-group > div {
</span><span class="cx"> white-space: normal;
</span><span class="cx"> }
</span><span class="lines">@@ -230,7 +243,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mce-toolbar .mce-colorbutton .mce-preview {
</span><del>- margin-left: -17px;
</del><ins>+ margin-left: -16px;
</ins><span class="cx"> padding: 0;
</span><span class="cx"> width: 18px;
</span><span class="cx"> }
</span><span class="lines">@@ -430,25 +443,6 @@
</span><span class="cx"> text-shadow: 0 -1px 0 rgba(0,0,0,0.1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and ( max-width: 782px ) {
- .mce-toolbar .mce-btn button {
- padding: 5px 6px;
- }
-
- #wp-fullscreen-buttons .mce-btn,
- .mce-toolbar .mce-btn-group .mce-btn {
- margin: 0 3px;
- }
-
- .mce-toolbar .mce-colorbutton .mce-preview {
- margin-left: -20px;
- }
-
- .mce-window .mce-btn {
- padding: 2px 0;
- }
-}
-
</del><span class="cx"> /* Charmap modal */
</span><span class="cx"> .mce-charmap {
</span><span class="cx"> margin: 3px;
</span><span class="lines">@@ -502,21 +496,25 @@
</span><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-toolbar .mce-btn:hover .mce-ico,
-.mce-toolbar .mce-btn.mce-active .mce-ico,
-.mce-toolbar .mce-btn:hover .mce-caret,
-.mce-toolbar .mce-btn.mce-active .mce-caret {
- color: #333;
</del><ins>+.qt-fullscreen {
+ color: #777;
+ line-height: 20px;
+ width: 28px;
+ height: 26px;
+ text-align: center;
+ text-shadow: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.mce-toolbar .mce-btn.mce-active .mce-open {
- border-left-color: #bdbdbd;
-}
-
</del><span class="cx"> .mce-toolbar .mce-btn .mce-open {
</span><span class="cx"> line-height: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.mce-toolbar .mce-btn:hover .mce-open,
+.mce-toolbar .mce-btn:focus .mce-open,
+.mce-toolbar .mce-btn.mce-active .mce-open {
+ border-left-color: #999;
+}
+
</ins><span class="cx"> i.mce-i-bold,
</span><span class="cx"> i.mce-i-italic,
</span><span class="cx"> i.mce-i-bullist,
</span><span class="lines">@@ -561,6 +559,14 @@
</span><span class="cx"> padding-right: 2px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.qt-fullscreen {
+ font: normal 20px/1 'dashicons';
+ vertical-align: top;
+ speak: none;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
</ins><span class="cx"> i.mce-i-bold:before {
</span><span class="cx"> content: '\f200';
</span><span class="cx"> }
</span><span class="lines">@@ -614,7 +620,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> i.mce-i-fullscreen:before,
</span><del>-i.mce-i-wp_fullscreen:before {
</del><ins>+i.mce-i-wp_fullscreen:before,
+.qt-fullscreen:before {
</ins><span class="cx"> content: '\f211';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -688,7 +695,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mce-i-wp_code:before {
</span><del>- content: "\e017";
</del><ins>+ content: '\e017';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Editors */
</span><span class="lines">@@ -839,46 +846,14 @@
</span><span class="cx"> .quicktags-toolbar {
</span><span class="cx"> border-bottom-style: solid;
</span><span class="cx"> border-bottom-width: 1px;
</span><del>- padding: 2px 8px 0;
- min-height: 29px;
</del><ins>+ padding: 3px 35px 3px 3px;
+ position: relative;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.quicktags-toolbar > div {
- padding: 2px 4px 0;
</del><ins>+.wp-core-ui .quicktags-toolbar input.button.button-small {
+ margin: 2px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.quicktags-toolbar input {
- margin: 2px 1px 4px;
- line-height: 18px;
- display: inline-block;
- min-width: 26px;
- padding: 2px 4px;
- font: 12px/18px "Open Sans", sans-serif;
- color: #464646;
- cursor: pointer;
- border: 1px solid #c3c3c3;
- -webkit-border-radius: 3px;
- border-radius: 3px;
- background: #eee;
- background-image: -webkit-gradient(linear, left bottom, left top, from(#e3e3e3), to(#fff));
- background-image: -webkit-linear-gradient(bottom, #e3e3e3, #fff);
- background-image: linear-gradient(to top, #e3e3e3, #fff);
-}
-
-.quicktags-toolbar input:hover {
- border-color: #aaa;
- background: #ddd;
-}
-
-.quicktags-toolbar input:focus {
- border-color: #777;
- outline: 0;
-}
-
-.quicktags-toolbar input:active {
- border-color: #aaa;
-}
-
</del><span class="cx"> .quicktags-toolbar input[value="link"] {
</span><span class="cx"> text-decoration: underline;
</span><span class="cx"> }
</span><span class="lines">@@ -895,6 +870,49 @@
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.mce-toolbar .mce-btn-group .mce-btn.mce-wp-fullscreen,
+.qt-fullscreen {
+ position: absolute;
+ top: 0;
+ right: 0;
+ margin-top: 5px;
+ margin-right: 5px;
+}
+
+@media screen and ( max-width: 782px ) {
+ .mce-toolbar .mce-btn button,
+ .qt-fullscreen {
+ padding: 7px 8px;
+ }
+
+ .qt-fullscreen {
+ width: 38px;
+ height: 34px;
+ }
+
+ .mce-toolbar .mce-colorbutton .mce-preview {
+ margin-left: -21px;
+ }
+
+ .mce-window .mce-btn {
+ padding: 2px 0;
+ }
+
+ div.mce-toolbar-grp,
+ .quicktags-toolbar {
+ padding-right: 46px;
+ }
+}
+
+@media screen and ( min-width: 782px ) {
+ .wp-core-ui .quicktags-toolbar input.button.button-small {
+ /* .button-small is normaly 11px, but a bit too small for these buttons. */
+ font-size: 12px;
+ height: 26px;
+ line-height: 24px;
+ }
+}
+
</ins><span class="cx"> #wp_editbtns,
</span><span class="cx"> #wp_gallerybtns {
</span><span class="cx"> padding: 2px;
</span><span class="lines">@@ -1424,8 +1442,12 @@
</span><span class="cx"> /* =Overlay Body
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><ins>+#wp-fullscreen-body,
+.mce-fullscreen {
+ z-index: 100010;
+}
+
</ins><span class="cx"> #wp-fullscreen-body {
</span><del>- z-index: 100010;
</del><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1438,7 +1460,6 @@
</span><span class="cx"> bottom: 30px;
</span><span class="cx"> top: 60px;
</span><span class="cx"> z-index: 100015;
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .wp-fullscreen-wrap .wp-editor-container,
</span><span class="lines">@@ -1500,7 +1521,7 @@
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx"> #fullscreen-topbar {
</span><span class="cx"> background: #f5f5f5;
</span><del>- border-bottom: 1px solid #fff;
</del><ins>+ border-bottom: 1px solid #dedede;
</ins><span class="cx"> height: 45px;
</span><span class="cx"> position: fixed;
</span><span class="cx"> left: 0;
</span><span class="lines">@@ -1553,51 +1574,6 @@
</span><span class="cx"> padding: 3px 14px 0 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#wp-fullscreen-modes a {
- display: block;
- font-size: 11px;
- text-decoration: none;
- float: left;
- margin: 1px 0 0 0;
- padding: 2px 6px 2px;
- border-width: 1px 1px 1px 0;
- border-style: solid;
- border-color: #bbb;
- color: #777;
- text-shadow: 0 1px 0 #fff;
- background-color: #f4f4f4;
- background: #f4f4f4;
- background-image: -webkit-gradient(linear, left bottom, left top, from(#e4e4e4), to(#f9f9f9));
- background-image: -webkit-linear-gradient(bottom, #e4e4e4, #f9f9f9);
- background-image: linear-gradient(to top, #e4e4e4, #f9f9f9);
-}
-
-#wp-fullscreen-modes a:hover,
-.wp-html-mode #wp-fullscreen-modes a:last-child,
-.wp-tmce-mode #wp-fullscreen-modes a:first-child {
- color: #333;
- border-color: #999;
- background: #eee;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#e4e4e4), to(#f9f9f9));
- background-image: -webkit-linear-gradient(top, #e4e4e4, #f9f9f9);
- background-image: linear-gradient(to bottom, #e4e4e4, #f9f9f9);
-}
-
-#wp-fullscreen-modes a:first-child {
- border-width: 1px;
- -webkit-border-top-left-radius: 3px;
- border-top-left-radius: 3px;
- -webkit-border-bottom-left-radius: 3px;
- border-bottom-left-radius: 3px;
-}
-
-#wp-fullscreen-modes a:last-child {
- -webkit-border-top-right-radius: 3px;
- border-top-right-radius: 3px;
- -webkit-border-bottom-right-radius: 3px;
- border-bottom-right-radius: 3px;
-}
-
</del><span class="cx"> #wp-fullscreen-buttons .hidden {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjsquicktagsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/quicktags.js (27856 => 27857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/quicktags.js 2014-03-29 23:18:54 UTC (rev 27856)
+++ trunk/src/wp-includes/js/quicktags.js 2014-03-29 23:57:13 UTC (rev 27857)
</span><span class="lines">@@ -406,7 +406,10 @@
</span><span class="cx"> };
</span><span class="cx"> qt.Button.prototype.html = function(idPrefix) {
</span><span class="cx"> var access = this.access ? ' accesskey="' + this.access + '"' : '';
</span><del>- return '<input type="button" id="' + idPrefix + this.id + '"' + access + ' class="ed_button" title="' + this.title + '" value="' + this.display + '" />';
</del><ins>+ if ( this.id === 'fullscreen' ) {
+ return '<button type="button" id="' + idPrefix + this.id + '"' + access + ' class="ed_button qt-fullscreen" title="' + this.title + '"></button>';
+ }
+ return '<input type="button" id="' + idPrefix + this.id + '"' + access + ' class="ed_button button button-small" title="' + this.title + '" value="' + this.display + '" />';
</ins><span class="cx"> };
</span><span class="cx"> qt.Button.prototype.callback = function(){};
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswordpresspluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (27856 => 27857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-03-29 23:18:54 UTC (rev 27856)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-03-29 23:57:13 UTC (rev 27857)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> cmd: 'WP_Adv',
</span><span class="cx"> onPostRender: function() {
</span><span class="cx"> wpAdvButton = this;
</span><ins>+ wpAdvButton.active( getUserSetting( 'hidetb' ) === '1' ? true : false );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpfullscreenpluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js (27856 => 27857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js 2014-03-29 23:18:54 UTC (rev 27856)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js 2014-03-29 23:57:13 UTC (rev 27857)
</span><span class="lines">@@ -91,7 +91,8 @@
</span><span class="cx"> editor.addButton( 'wp_fullscreen', {
</span><span class="cx"> tooltip: 'Distraction Free Writing',
</span><span class="cx"> shortcut: 'Alt+Shift+W',
</span><del>- onclick: toggleFullscreen
</del><ins>+ onclick: toggleFullscreen,
+ classes: 'wp-fullscreen btn widget' // This overwrites all classes on the container!
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> editor.addMenuItem( 'wp_fullscreen', {
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/version.php (27856 => 27857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/version.php 2014-03-29 23:18:54 UTC (rev 27856)
+++ trunk/src/wp-includes/version.php 2014-03-29 23:57:13 UTC (rev 27857)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $wp_version
</span><span class="cx"> */
</span><del>-$wp_version = '3.9-beta3-27851-src';
</del><ins>+$wp_version = '3.9-beta3-27857-src';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span></span></pre>
</div>
</div>
</body>
</html>