- 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 #27279
Built from https://develop.svn.wordpress.org/trunk@27857


git-svn-id: http://core.svn.wordpress.org/trunk@27688 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-03-29 23:58:14 +00:00
parent 51c58c5be3
commit bfaf007e97
15 changed files with 270 additions and 307 deletions

View File

@ -439,7 +439,8 @@
api.refreshButtons = function( fade ) {
if ( s.mode === 'html' ) {
$('#wp-fullscreen-mode-bar').removeClass('wp-tmce-mode').addClass('wp-html-mode');
$('#wp-fullscreen-mode-bar').removeClass('wp-tmce-mode').addClass('wp-html-mode')
.find('a').removeClass( 'active' ).filter('.wp-fullscreen-mode-html').addClass( 'active' );
if ( fade ) {
$('#wp-fullscreen-button-bar').fadeOut( 150, function(){
@ -449,7 +450,8 @@
$('#wp-fullscreen-button-bar').addClass('wp-html-mode');
}
} else if ( s.mode === 'tinymce' ) {
$('#wp-fullscreen-mode-bar').removeClass('wp-html-mode').addClass('wp-tmce-mode');
$('#wp-fullscreen-mode-bar').removeClass('wp-html-mode').addClass('wp-tmce-mode')
.find('a').removeClass( 'active' ).filter('.wp-fullscreen-mode-tinymce').addClass( 'active' );
if ( fade ) {
$('#wp-fullscreen-button-bar').fadeOut( 150, function(){

File diff suppressed because one or more lines are too long

View File

@ -669,8 +669,10 @@ final class _WP_Editors {
if ( self::$has_tinymce )
wp_enqueue_script('editor');
if ( self::$has_quicktags )
wp_enqueue_script('quicktags');
if ( self::$has_quicktags ) {
wp_enqueue_script( 'quicktags' );
wp_enqueue_style( 'buttons' );
}
if ( in_array('wplink', self::$plugins, true) || in_array('link', self::$qt_buttons, true) ) {
wp_enqueue_script('wplink');
@ -1115,10 +1117,12 @@ final class _WP_Editors {
<div id="wp-fullscreen-close"><a href="#" onclick="wp.editor.fullscreen.off();return false;"><?php _e('Exit fullscreen'); ?></a></div>
<div id="wp-fullscreen-central-toolbar" style="width:<?php echo $width; ?>px;">
<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>
<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>
<div id="wp-fullscreen-button-bar"><div id="wp-fullscreen-buttons" class="mce-toolbar">
<?php

View File

@ -144,10 +144,12 @@ div.mce-panel {
div.mce-toolbar-grp {
border-bottom: 1px solid #dedede;
background: #f5f5f5;
padding: 3px 3px 3px 35px;
position: relative;
}
.mce-toolbar {
padding: 1px 3px;
.mce-toolbar .mce-btn-group {
margin: 0;
}
div.mce-statusbar {
@ -159,48 +161,62 @@ div.mce-path {
margin: 0;
}
.mce-toolbar .mce-btn {
.mce-toolbar .mce-btn,
.qt-fullscreen {
border-color: transparent;
background: transparent;
-webkit-box-shadow: none;
box-shadow: none;
text-shadow: none;
cursor: pointer;
}
#wp-fullscreen-buttons .mce-btn,
.mce-toolbar .mce-btn-group .mce-btn {
.mce-toolbar .mce-btn-group .mce-btn,
.qt-fullscreen {
border: 1px solid transparent;
margin: 0 1px;
-webkit-border-radius: 2px;
border-radius: 2px;
margin: 2px;
background-image: none;
-webkit-border-radius: 3px;
border-radius: 3px;
-webkit-filter: none;
filter: none;
}
#wp-fullscreen-buttons .mce-btn:hover,
.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, right bottom, right top, from(#e5e5e5), to(#fff));
background-image: -webkit-linear-gradient(bottom, #e5e5e5, #fff);
background-image: linear-gradient(to top, #e5e5e5, #fff);
.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 );
}
.mce-toolbar .mce-btn-group .mce-btn.mce-active {
-webkit-box-shadow: 0 0 transparent;
box-shadow: 0 0 transparent;
border-color: #bbb;
.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 {
background: #eee;
background-image: -webkit-gradient(linear, right bottom, right top, from(#f6f6f6), to(#e3e3e3));
background-image: -webkit-linear-gradient(bottom, #f6f6f6, #e3e3e3);
background-image: linear-gradient(to top, #f6f6f6, #e3e3e3);
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 );
}
.mce-toolbar .mce-btn-group .mce-disabled.mce-btn:hover {
border-color: transparent;
background: transparent;
.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;
}
.mce-toolbar .mce-btn-group .mce-first,
@ -208,7 +224,8 @@ div.mce-path {
border-color: transparent;
}
.mce-toolbar .mce-btn button {
.mce-toolbar .mce-btn button,
.qt-fullscreen {
padding: 2px 3px;
line-height: normal;
}
@ -217,10 +234,6 @@ div.mce-path {
text-shadow: none;
}
.mce-toolbar .mce-btn:focus {
outline: 1px solid #888;
}
.mce-toolbar .mce-btn-group > div {
white-space: normal;
}
@ -230,7 +243,7 @@ div.mce-path {
}
.mce-toolbar .mce-colorbutton .mce-preview {
margin-right: -17px;
margin-right: -16px;
padding: 0;
width: 18px;
}
@ -430,25 +443,6 @@ div.mce-menu .mce-menu-item-sep,
text-shadow: 0 -1px 0 rgba(0,0,0,0.1);
}
@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-right: -20px;
}
.mce-window .mce-btn {
padding: 2px 0;
}
}
/* Charmap modal */
.mce-charmap {
margin: 3px;
@ -502,21 +496,25 @@ div.mce-menu .mce-menu-item-sep,
padding: 0;
}
.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;
}
.mce-toolbar .mce-btn.mce-active .mce-open {
border-right-color: #bdbdbd;
.qt-fullscreen {
color: #777;
line-height: 20px;
width: 28px;
height: 26px;
text-align: center;
text-shadow: none;
}
.mce-toolbar .mce-btn .mce-open {
line-height: 20px;
}
.mce-toolbar .mce-btn:hover .mce-open,
.mce-toolbar .mce-btn:focus .mce-open,
.mce-toolbar .mce-btn.mce-active .mce-open {
border-right-color: #999;
}
i.mce-i-bold,
i.mce-i-italic,
i.mce-i-bullist,
@ -561,6 +559,14 @@ i.mce-i-hr,
padding-left: 2px;
}
.qt-fullscreen {
font: normal 20px/1 'dashicons';
vertical-align: top;
speak: none;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
i.mce-i-bold:before {
content: '\f200';
}
@ -614,7 +620,8 @@ i.mce-i-spellchecker:before {
}
i.mce-i-fullscreen:before,
i.mce-i-wp_fullscreen:before {
i.mce-i-wp_fullscreen:before,
.qt-fullscreen:before {
content: '\f211';
}
@ -688,7 +695,7 @@ i.mce-i-hr:before {
}
.mce-i-wp_code:before {
content: "\e017";
content: '\e017';
}
/* Editors */
@ -839,44 +846,12 @@ i.mce-i-hr:before {
.quicktags-toolbar {
border-bottom-style: solid;
border-bottom-width: 1px;
padding: 2px 8px 0;
min-height: 29px;
padding: 3px 3px 3px 35px;
position: relative;
}
.quicktags-toolbar > div {
padding: 2px 4px 0;
}
.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, right bottom, right 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;
.wp-core-ui .quicktags-toolbar input.button.button-small {
margin: 2px;
}
.quicktags-toolbar input[value="link"] {
@ -895,6 +870,49 @@ i.mce-i-hr:before {
font-weight: bold;
}
.mce-toolbar .mce-btn-group .mce-btn.mce-wp-fullscreen,
.qt-fullscreen {
position: absolute;
top: 0;
left: 0;
margin-top: 5px;
margin-left: 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-right: -21px;
}
.mce-window .mce-btn {
padding: 2px 0;
}
div.mce-toolbar-grp,
.quicktags-toolbar {
padding-left: 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;
}
}
#wp_editbtns,
#wp_gallerybtns {
padding: 2px;
@ -1424,8 +1442,12 @@ i.mce-i-hr:before {
/* =Overlay Body
-------------------------------------------------------------- */
#wp-fullscreen-body {
#wp-fullscreen-body,
.mce-fullscreen {
z-index: 100010;
}
#wp-fullscreen-body {
display: none;
}
@ -1438,7 +1460,6 @@ i.mce-i-hr:before {
bottom: 30px;
top: 60px;
z-index: 100015;
}
.wp-fullscreen-wrap .wp-editor-container,
@ -1500,7 +1521,7 @@ i.mce-i-hr:before {
-------------------------------------------------------------- */
#fullscreen-topbar {
background: #f5f5f5;
border-bottom: 1px solid #fff;
border-bottom: 1px solid #dedede;
height: 45px;
position: fixed;
right: 0;
@ -1553,51 +1574,6 @@ i.mce-i-hr:before {
padding: 3px 0 0 14px;
}
#wp-fullscreen-modes a {
display: block;
font-size: 11px;
text-decoration: none;
float: right;
margin: 1px 0 0 0;
padding: 2px 6px 2px;
border-width: 1px 0 1px 1px;
border-style: solid;
border-color: #bbb;
color: #777;
text-shadow: 0 1px 0 #fff;
background-color: #f4f4f4;
background: #f4f4f4;
background-image: -webkit-gradient(linear, right bottom, right 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, right top, right 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-right-radius: 3px;
border-top-right-radius: 3px;
-webkit-border-bottom-right-radius: 3px;
border-bottom-right-radius: 3px;
}
#wp-fullscreen-modes a:last-child {
-webkit-border-top-left-radius: 3px;
border-top-left-radius: 3px;
-webkit-border-bottom-left-radius: 3px;
border-bottom-left-radius: 3px;
}
#wp-fullscreen-buttons .hidden {
display: none;
}

File diff suppressed because one or more lines are too long

View File

@ -144,10 +144,12 @@ div.mce-panel {
div.mce-toolbar-grp {
border-bottom: 1px solid #dedede;
background: #f5f5f5;
padding: 3px 35px 3px 3px;
position: relative;
}
.mce-toolbar {
padding: 1px 3px;
.mce-toolbar .mce-btn-group {
margin: 0;
}
div.mce-statusbar {
@ -159,48 +161,62 @@ div.mce-path {
margin: 0;
}
.mce-toolbar .mce-btn {
.mce-toolbar .mce-btn,
.qt-fullscreen {
border-color: transparent;
background: transparent;
-webkit-box-shadow: none;
box-shadow: none;
text-shadow: none;
cursor: pointer;
}
#wp-fullscreen-buttons .mce-btn,
.mce-toolbar .mce-btn-group .mce-btn {
.mce-toolbar .mce-btn-group .mce-btn,
.qt-fullscreen {
border: 1px solid transparent;
margin: 0 1px;
-webkit-border-radius: 2px;
border-radius: 2px;
margin: 2px;
background-image: none;
-webkit-border-radius: 3px;
border-radius: 3px;
-webkit-filter: none;
filter: none;
}
#wp-fullscreen-buttons .mce-btn:hover,
.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);
.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 );
}
.mce-toolbar .mce-btn-group .mce-btn.mce-active {
-webkit-box-shadow: 0 0 transparent;
box-shadow: 0 0 transparent;
border-color: #bbb;
.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 {
background: #eee;
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);
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 );
}
.mce-toolbar .mce-btn-group .mce-disabled.mce-btn:hover {
border-color: transparent;
background: transparent;
.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;
}
.mce-toolbar .mce-btn-group .mce-first,
@ -208,7 +224,8 @@ div.mce-path {
border-color: transparent;
}
.mce-toolbar .mce-btn button {
.mce-toolbar .mce-btn button,
.qt-fullscreen {
padding: 2px 3px;
line-height: normal;
}
@ -217,10 +234,6 @@ div.mce-path {
text-shadow: none;
}
.mce-toolbar .mce-btn:focus {
outline: 1px solid #888;
}
.mce-toolbar .mce-btn-group > div {
white-space: normal;
}
@ -230,7 +243,7 @@ div.mce-path {
}
.mce-toolbar .mce-colorbutton .mce-preview {
margin-left: -17px;
margin-left: -16px;
padding: 0;
width: 18px;
}
@ -430,25 +443,6 @@ div.mce-menu .mce-menu-item-sep,
text-shadow: 0 -1px 0 rgba(0,0,0,0.1);
}
@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;
}
}
/* Charmap modal */
.mce-charmap {
margin: 3px;
@ -502,21 +496,25 @@ div.mce-menu .mce-menu-item-sep,
padding: 0;
}
.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;
}
.mce-toolbar .mce-btn.mce-active .mce-open {
border-left-color: #bdbdbd;
.qt-fullscreen {
color: #777;
line-height: 20px;
width: 28px;
height: 26px;
text-align: center;
text-shadow: none;
}
.mce-toolbar .mce-btn .mce-open {
line-height: 20px;
}
.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;
}
i.mce-i-bold,
i.mce-i-italic,
i.mce-i-bullist,
@ -561,6 +559,14 @@ i.mce-i-hr,
padding-right: 2px;
}
.qt-fullscreen {
font: normal 20px/1 'dashicons';
vertical-align: top;
speak: none;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
i.mce-i-bold:before {
content: '\f200';
}
@ -614,7 +620,8 @@ i.mce-i-spellchecker:before {
}
i.mce-i-fullscreen:before,
i.mce-i-wp_fullscreen:before {
i.mce-i-wp_fullscreen:before,
.qt-fullscreen:before {
content: '\f211';
}
@ -688,7 +695,7 @@ i.mce-i-hr:before {
}
.mce-i-wp_code:before {
content: "\e017";
content: '\e017';
}
/* Editors */
@ -839,44 +846,12 @@ i.mce-i-hr:before {
.quicktags-toolbar {
border-bottom-style: solid;
border-bottom-width: 1px;
padding: 2px 8px 0;
min-height: 29px;
padding: 3px 35px 3px 3px;
position: relative;
}
.quicktags-toolbar > div {
padding: 2px 4px 0;
}
.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;
.wp-core-ui .quicktags-toolbar input.button.button-small {
margin: 2px;
}
.quicktags-toolbar input[value="link"] {
@ -895,6 +870,49 @@ i.mce-i-hr:before {
font-weight: bold;
}
.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;
}
}
#wp_editbtns,
#wp_gallerybtns {
padding: 2px;
@ -1424,8 +1442,12 @@ i.mce-i-hr:before {
/* =Overlay Body
-------------------------------------------------------------- */
#wp-fullscreen-body {
#wp-fullscreen-body,
.mce-fullscreen {
z-index: 100010;
}
#wp-fullscreen-body {
display: none;
}
@ -1438,7 +1460,6 @@ i.mce-i-hr:before {
bottom: 30px;
top: 60px;
z-index: 100015;
}
.wp-fullscreen-wrap .wp-editor-container,
@ -1500,7 +1521,7 @@ i.mce-i-hr:before {
-------------------------------------------------------------- */
#fullscreen-topbar {
background: #f5f5f5;
border-bottom: 1px solid #fff;
border-bottom: 1px solid #dedede;
height: 45px;
position: fixed;
left: 0;
@ -1553,51 +1574,6 @@ i.mce-i-hr:before {
padding: 3px 14px 0 0;
}
#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;
}
#wp-fullscreen-buttons .hidden {
display: none;
}

File diff suppressed because one or more lines are too long

View File

@ -406,7 +406,10 @@ function edButton(id, display, tagStart, tagEnd, access) {
};
qt.Button.prototype.html = function(idPrefix) {
var access = this.access ? ' accesskey="' + this.access + '"' : '';
return '<input type="button" id="' + idPrefix + this.id + '"' + access + ' class="ed_button" title="' + this.title + '" value="' + this.display + '" />';
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 + '" />';
};
qt.Button.prototype.callback = function(){};

File diff suppressed because one or more lines are too long

View File

@ -57,6 +57,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
cmd: 'WP_Adv',
onPostRender: function() {
wpAdvButton = this;
wpAdvButton.active( getUserSetting( 'hidetb' ) === '1' ? true : false );
}
});

File diff suppressed because one or more lines are too long

View File

@ -91,7 +91,8 @@ tinymce.PluginManager.add( 'wpfullscreen', function( editor ) {
editor.addButton( 'wp_fullscreen', {
tooltip: 'Distraction Free Writing',
shortcut: 'Alt+Shift+W',
onclick: toggleFullscreen
onclick: toggleFullscreen,
classes: 'wp-fullscreen btn widget' // This overwrites all classes on the container!
});
editor.addMenuItem( 'wp_fullscreen', {

View File

@ -1 +1 @@
tinymce.PluginManager.add("wpfullscreen",function(a){function b(c){var d,e,f=a.getDoc(),h=f.body,i=tinymce.DOM,j=250;c&&"setcontent"===c.type&&c.initial||a.settings.inline||(e=tinymce.Env.ie?h.scrollHeight:tinymce.Env.webkit&&0===h.clientHeight?0:h.offsetHeight,e>250&&(j=e),h.scrollTop=0,j!==g&&(d=j-g,i.setStyle(i.get(a.id+"_ifr"),"height",j+"px"),g=j,tinymce.isWebKit&&0>d&&b(c)))}function c(){f.wp_fullscreen=!0,a.dom.addClass(a.getDoc().documentElement,"wp-fullscreen"),a.on("change setcontent paste keyup",b)}function d(){f.wp_fullscreen=!1,a.dom.removeClass(a.getDoc().documentElement,"wp-fullscreen"),a.off("change setcontent paste keyup",b),g=0}function e(){"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen&&(a.getParam("wp_fullscreen")?wp.editor.fullscreen.off():wp.editor.fullscreen.on())}var f=a.settings,g=0;a.addCommand("wpAutoResize",b),a.addCommand("wpFullScreenOn",c),a.addCommand("wpFullScreenOff",d),a.addCommand("wpFullScreen",e),a.on("init",function(){a.getParam("wp_fullscreen")&&c(),a.addShortcut("alt+shift+w","","wpFullScreen")}),a.addButton("wp_fullscreen",{tooltip:"Distraction Free Writing",shortcut:"Alt+Shift+W",onclick:e}),a.addMenuItem("wp_fullscreen",{text:"Distraction Free Writing",icon:"wp_fullscreen",shortcut:"Alt+Shift+W",context:"view",onclick:e})});
tinymce.PluginManager.add("wpfullscreen",function(a){function b(c){var d,e,f=a.getDoc(),h=f.body,i=tinymce.DOM,j=250;c&&"setcontent"===c.type&&c.initial||a.settings.inline||(e=tinymce.Env.ie?h.scrollHeight:tinymce.Env.webkit&&0===h.clientHeight?0:h.offsetHeight,e>250&&(j=e),h.scrollTop=0,j!==g&&(d=j-g,i.setStyle(i.get(a.id+"_ifr"),"height",j+"px"),g=j,tinymce.isWebKit&&0>d&&b(c)))}function c(){f.wp_fullscreen=!0,a.dom.addClass(a.getDoc().documentElement,"wp-fullscreen"),a.on("change setcontent paste keyup",b)}function d(){f.wp_fullscreen=!1,a.dom.removeClass(a.getDoc().documentElement,"wp-fullscreen"),a.off("change setcontent paste keyup",b),g=0}function e(){"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen&&(a.getParam("wp_fullscreen")?wp.editor.fullscreen.off():wp.editor.fullscreen.on())}var f=a.settings,g=0;a.addCommand("wpAutoResize",b),a.addCommand("wpFullScreenOn",c),a.addCommand("wpFullScreenOff",d),a.addCommand("wpFullScreen",e),a.on("init",function(){a.getParam("wp_fullscreen")&&c(),a.addShortcut("alt+shift+w","","wpFullScreen")}),a.addButton("wp_fullscreen",{tooltip:"Distraction Free Writing",shortcut:"Alt+Shift+W",onclick:e,classes:"wp-fullscreen btn widget"}),a.addMenuItem("wp_fullscreen",{text:"Distraction Free Writing",icon:"wp_fullscreen",shortcut:"Alt+Shift+W",context:"view",onclick:e})});

View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '3.9-beta3-27851';
$wp_version = '3.9-beta3-27857';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.