Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 17:48:01 +01:00
Code Issues Projects Releases Wiki Activity

Editor toolbar/textarea styling. Props chexee. see #17324, #15986.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17868 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
koopersmith 2011-05-11 22:28:29 +00:00
parent 4584d39d5a
commit fb65cc1f7f
5 changed files with 71 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/colors-fresh.css
View File

File diff suppressed because one or more lines are too long

75
wp-admin/css/colors-fresh.dev.css
View File

@ -828,7 +828,7 @@ table.widefat .spam a:hover,
/* editors */
#quicktags {
border-color: #dfdfdf;
border-color: #ccc;
background-color: #dfdfdf;
background-image: url("../images/ed-bg.gif");
}
@ -843,18 +843,21 @@ table.widefat .spam a:hover,
}
#poststuff .wp_themeSkin .mceStatusbar {
border-color: #EDEDED;
border-color: #dfdfdf;
}
#poststuff .wp_themeSkin .mceStatusbar * {
color: #555;
}
#poststuff #edButtonPreview,
#poststuff #edButtonHTML {
background-color: #f1f1f1;
border-color: #dfdfdf;
border-color: #dfdfdf #dfdfdf #ccc;
color: #999;
}
#poststuff #editor-toolbar .active {
border-bottom-color: #e9e9e9;
border-color: #ccc #ccc #e9e9e9;
background-color: #e9e9e9;
color: #333;
}
@ -873,8 +876,17 @@ table.widefat .spam a:hover,
}
/* Containers */
.wp_themeSkin table.mceLayout {
border-color: #ccc #ccc #dfdfdf;
}
#editorcontainer #content,
.wp_themeSkin .mceIframeContainer {
-moz-box-shadow: inset 1px 1px 2px rgba( 0, 0, 0, 0.1 );
-webkit-box-shadow: inset 1px 1px 2px rgba( 0, 0, 0, 0.1 );
box-shadow: inset 1px 1px 2px rgba( 0, 0, 0, 0.1 );
}
.wp_themeSkin iframe {
background: #fff;
background: transparent;
}
/* Layout */
@ -891,19 +903,18 @@ table.widefat .spam a:hover,
background-image: -moz-linear-gradient(bottom, #ddd, #fff); /* Firefox */
background-image: -o-linear-gradient(bottom, #ddd, #fff); /* Opera */
background-image: -webkit-gradient(linear, left bottom, left top, from(#ddd), to(#fff)); /* old Webkit */
background-image: -webkit-linear-gradient(bottom, #ddd, #fff) !important; /* new Webkit */
background-image: -webkit-linear-gradient(bottom, #ddd, #fff); /* new Webkit */
background-image: linear-gradient(bottom, #ddd, #fff); /* proposed W3C Markup */
}
.wp_themeSkin a.mceButtonEnabled:hover {
background: #d5d5d5;
border-color: #a0a0a0 !important;
background-color: #c9c9c9; /* Fallback */
border-color: #a0a0a0;
background: #ddd; /* Fallback */
background-image: -ms-linear-gradient(bottom, #ccc, #fff); /* IE10 */
background-image: -moz-linear-gradient(bottom, #ccc, #fff); /* Firefox */
background-image: -o-linear-gradient(bottom, #ccc, #fff); /* Opera */
background-image: -webkit-gradient(linear, left bottom, left top, from(#ccc), to(#fff)); /* old Webkit */
background-image: -webkit-linear-gradient(bottom, #ccc, #fff) !important; /* new Webkit */
background-image: -webkit-linear-gradient(bottom, #ccc, #fff); /* new Webkit */
background-image: linear-gradient(bottom, #ccc, #fff); /* proposed W3C Markup */
}
@ -913,13 +924,14 @@ table.widefat .spam a:hover,
.wp_themeSkin a.mceButtonActive,
.wp_themeSkin a.mceButtonActive:active,
.wp_themeSkin a.mceButtonActive:hover {
background-color: #ddd; /* Fallback */
background-image: -ms-linear-gradient(bottom, #eee, #bbb); /* IE10 */
background-image: -moz-linear-gradient(bottom, #eee, #bbb); /* Firefox */
background-image: -o-linear-gradient(bottom, #eee, #bbb); /* Opera */
background-image: -webkit-gradient(linear, left bottom, left top, from(#eee), to(#bbb)); /* old Webkit */
background-image: -webkit-linear-gradient(bottom, #eee, #bbb) !important; /* new Webkit */
background-image: -webkit-linear-gradient(bottom, #eee, #bbb); /* new Webkit */
background-image: linear-gradient(bottom, #eee, #bbb); /* proposed W3C Markup */
border-color: #909090 !important;
border-color: #909090;
}
.wp_themeSkin .mceButtonDisabled {
@ -930,17 +942,17 @@ table.widefat .spam a:hover,
.wp_themeSkin .mceListBox .mceText,
.wp_themeSkin .mceListBox .mceOpen {
border-color: #ccc;
background-color: #c9c9c9; /* Fallback */
background-color: #eee; /* Fallback */
background-image: -ms-linear-gradient(bottom, #ddd, #fff); /* IE10 */
background-image: -moz-linear-gradient(bottom, #ddd, #fff); /* Firefox */
background-image: -o-linear-gradient(bottom, #ddd, #fff); /* Opera */
background-image: -webkit-gradient(linear, left bottom, left top, from(#ddd), to(#fff)); /* old Webkit */
background-image: -webkit-linear-gradient(bottom, #ddd, #fff); !important/* new Webkit */
background-image: -webkit-linear-gradient(bottom, #ddd, #fff); /* new Webkit */
background-image: linear-gradient(bottom, #ddd, #fff); /* proposed W3C Markup */
}
.wp_themeSkin .mceListBox .mceOpen {
border-left: 0px !important;
border-left: 0 !important;
}
.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,
@ -950,7 +962,7 @@ table.widefat .spam a:hover,
.wp_themeSkin .mceListBoxSelected .mceText,
.wp_themeSkin table.mceListBoxEnabled:active .mceText {
background: #ccc;
border-color: #999 !important;
border-color: #999;
}
/* List Box Hover */
@ -958,13 +970,13 @@ table.widefat .spam a:hover,
.wp_themeSkin .mceListBoxHover .mceText,
.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,
.wp_themeSkin .mceListBoxHover .mceOpen {
border-color: #909090 !important;
background-color: #c9c9c9; /* Fallback */
border-color: #909090;
background-color: #eee; /* Fallback */
background-image: -ms-linear-gradient(bottom, #ccc, #fff); /* IE10 */
background-image: -moz-linear-gradient(bottom, #ccc, #fff); /* Firefox */
background-image: -o-linear-gradient(bottom, #ccc, #fff); /* Opera */
background-image: -webkit-gradient(linear, left bottom, left top, from(#ccc), to(#fff)); /* old Webkit */
background-image: -webkit-linear-gradient(bottom, #ccc, #fff) !important; /* new Webkit */
background-image: -webkit-linear-gradient(bottom, #ccc, #fff); /* new Webkit */
background-image: linear-gradient(bottom, #ccc, #fff); /* proposed W3C Markup */
}
@ -983,17 +995,17 @@ table.widefat .spam a:hover,
.wp_themeSkin .mceSplitButtonSelected a.mceOpen,
.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,
.wp_themeSkin .mceSplitButton a.mceAction:hover {
border-color: #909090 !important;
border-color: #909090;
}
.wp_themeSkin table.mceSplitButton td {
background-color: #c9c9c9; /* Fallback */
background-color: #eee; /* Fallback */
background-image: -ms-linear-gradient(bottom, #ddd, #fff); /* IE10 */
background-image: -moz-linear-gradient(bottom, #ddd, #fff); /* Firefox */
background-image: -o-linear-gradient(bottom, #ddd, #fff); /* Opera */
background-image: -webkit-gradient(linear, left bottom, left top, from(#ddd), to(#fff)); /* old Webkit */
background-image: -webkit-linear-gradient(bottom, #ddd, #fff) !important; /* new Webkit */
background-image: -webkit-linear-gradient(bottom, #ddd, #fff); /* new Webkit */
background-image: linear-gradient(bottom, #ddd, #fff); /* proposed W3C Markup */
}
@ -1002,7 +1014,7 @@ table.widefat .spam a:hover,
background-image: -moz-linear-gradient(bottom, #ccc, #fff); /* Firefox */
background-image: -o-linear-gradient(bottom, #ccc, #fff); /* Opera */
background-image: -webkit-gradient(linear, left bottom, left top, from(#ccc), to(#fff)); /* old Webkit */
background-image: -webkit-linear-gradient(bottom, #ccc, #fff) !important; /* new Webkit */
background-image: -webkit-linear-gradient(bottom, #ccc, #fff); /* new Webkit */
background-image: linear-gradient(bottom, #ccc, #fff); /* proposed W3C Markup */
}
@ -1066,7 +1078,7 @@ table.widefat .spam a:hover,
.wp_themeSkin tr.mceFirst td.mceToolbar {
background: #dfdfdf url("../images/ed-bg.gif") repeat-x scroll left top;
border-color: #dfdfdf;
border-color: #ccc;
}
.wp-admin #mceModalBlocker {
@ -1130,9 +1142,18 @@ table.widefat .spam a:hover,
}
/* end TinyMCE */
#editorcontainer,
#post-status-info,
#titlediv #title,
#titlediv #title {
border-color: #ccc;
}
#editorcontainer {
border-color: #ccc #ccc #dfdfdf;
}
#post-status-info {
border-color: #dfdfdf #ccc #ccc;
}
.editwidget .widget-inside {
border-color: #dfdfdf;
}

4
wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css
View File

@ -35,8 +35,8 @@ font[face=mceinline] {font-family:inherit !important}
.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}
/* WordPress styles */
html {
background-color: #fff;
html, body {
background-color: transparent;
}
.aligncenter,

36
wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css
View File

@ -21,9 +21,10 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we
.wp_themeSkin .mceIframeContainer {}
.wp_themeSkin .mceStatusbar {
display: block;
font-family: 'MS Sans Serif',sans-serif,Verdana,Arial;
font-size: 9pt;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
font-size: 12px;
line-height: 16px;
padding-left: 5px;
overflow: visible;
height: 20px;
border-top-width: 1px;
@ -66,20 +67,17 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we
background-image: inherit 0 -10px;
}
.wp_themeSkin a.mceButton span, .wp_themeSkin a.mceButton img {}
.wp_themeSkin .mceOldBoxModel a.mceButton span, .wp_themeSkin .mceOldBoxModel a.mceButton img {margin:0 0 0 1px}
.wp_themeSkin a.mceButton:active,
.wp_themeSkin a.mceButtonActive,
.wp_themeSkin a.mceButtonActive:hover,
.wp_themeSkin a.mceButtonSelected {
background-image: inherit;
-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
}
.wp_themeSkin .mceButtonDisabled .mceIcon {opacity:0.4; filter:alpha(opacity=40);}
.wp_themeSkin .mceButtonDisabled {}
/* Separator */
.wp_themeSkin .mceSeparator {
@ -96,7 +94,7 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we
.wp_themeSkin .mceListBox .mceText {
padding: 1px 2px 1px 5px;
text-align:left;
text-decoration: none !important;
text-decoration: none;
width:70px;
-moz-border-bottom-left-radius: 2px;
-webkit-border-bottom-left-radius: 2px;
@ -109,8 +107,8 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we
-webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
font-family: Tahoma,Verdana,Arial,Helvetica;
font-size: 11px;
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
font-size: 12px;
height: 20px;
line-height: 20px;
overflow: hidden;
@ -155,7 +153,10 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we
.wp_themeSkin .mceListBoxDisabled .mceText {color:gray}
.wp_themeSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
.wp_themeSkin .mceOldBoxModel .mceListBox .mceText {height:22px}
.wp_themeSkin select.mceListBox {font-family:Tahoma,Verdana,Arial,Helvetica; font-size:12px;}
.wp_themeSkin select.mceListBox {
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
font-size:12px;
}
/* SplitButton */
.wp_themeSkin .mceSplitButton a, .wp_themeSkin .mceSplitButton span {display:block; height:20px}
@ -261,7 +262,9 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we
margin:0;
padding:0 25px;
}
.wp_themeSkin .mceMenu span.mceText, .wp_themeSkin .mceMenu .mcePreview {font-size:11px}
.wp_themeSkin .mceMenu span.mceText, .wp_themeSkin .mceMenu .mcePreview {
font-size: 12px;
}
.wp_themeSkin .mceMenu pre.mceText {font-family:Monospace}
.wp_themeSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover,
@ -288,16 +291,15 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we
.wp_themeSkin .mcePlaceHolder {border:1px dotted gray}
/* Formats */
.wp_themeSkin .mce_formatPreview a {font-size:10px}
.wp_themeSkin .mce_p span.mceText {}
.wp_themeSkin .mce_address span.mceText {font-style:italic}
.wp_themeSkin .mce_pre span.mceText {font-family:monospace}
.wp_themeSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
.wp_themeSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
.wp_themeSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
.wp_themeSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
.wp_themeSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
.wp_themeSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
.wp_themeSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 17px}
.wp_themeSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 16px}
.wp_themeSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 15px}
.wp_themeSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 14px}
.wp_themeSkin .mce_h5 span.mceText {font-weight:bolder; font-size: 13px}
.wp_themeSkin .mce_h6 span.mceText {font-weight:bolder; font-size: 12px}
/* Theme */
.wp_themeSkin span.mce_bold {background-position:0 0}

2
wp-includes/script-loader.php
View File

@ -493,7 +493,7 @@ function wp_default_styles( &$styles ) {
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
// all colors stylesheets need to have the same query strings (cache manifest compat)
$colors_version = '20110511e';
$colors_version = '20110511f';
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
$styles->add( 'colors', true, array(), $colors_version );