Changeset 7232

Timestamp:

03/11/08 07:31:19 (10 months ago)

Author:

matt

Message:

Abstract TinyMCE colors. Fixes #6154. Hat tip: azaozz.

Files:

• trunk/wp-admin/css/colors-classic.css (modified) (1 diff)
• trunk/wp-admin/css/colors-fresh.css (modified) (1 diff)
• trunk/wp-admin/css/ie.css (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css (modified) (13 diffs)

trunk/wp-admin/css/colors-classic.css

@@ -535 +535 @@
-    color: #888; 
-}
+
+
+/* TinyMCE */
+.wp_themeSkin *,
+.wp_themeSkin a:hover, 
+.wp_themeSkin a:link, 
+.wp_themeSkin a:visited, 
+.wp_themeSkin a:active {
+     color: #000;
+}
+
+/* Containers */
+.wp_themeSkin table {
+    background: #83B4D5;
+}
+
+.wp_themeSkin iframe {
+    background: #fff;
+}
+
+/* Layout */
+.wp_themeSkin .mceStatusbar {
+     color:#000;
+     background-color: #eaf3fa;
+}
+
+/* Button */
+.wp_themeSkin .mceButton { 
+    background-color: #e9e8e8;
+    border-color: #83B4D5;
+}
+
+.wp_themeSkin a.mceButtonEnabled:hover,
+.wp_themeSkin a.mceButtonActive, 
+.wp_themeSkin a.mceButtonSelected {
+    background-color: #d6d8da;
+    border-color: #7789ba !important;
+}
+
+.wp_themeSkin .mceButtonDisabled {
+    border-color: #83B4D5 !important;
+}
+
+/* ListBox */
+.wp_themeSkin .mceListBox .mceText,
+.wp_themeSkin .mceListBox .mceOpen  {
+    border-color: #83B4D5;
+    background-color: #e9e8e8;
+}
+
+.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, 
+.wp_themeSkin .mceListBoxHover .mceOpen,
+.wp_themeSkin .mceListBoxSelected .mceOpen,
+.wp_themeSkin .mceListBoxSelected .mceText {
+    border-color: #7789ba !important;
+    background-color: #d6d8da;
+}
+
+.wp_themeSkin table.mceListBoxEnabled:hover .mceText, 
+.wp_themeSkin .mceListBoxHover .mceText {
+    border-color: #7789ba !important;
+}
+
+.wp_themeSkin select.mceListBox {
+    border-color: #b3c7e1; 
+    background-color: #fff;
+}
+
+/* SplitButton */
+.wp_themeSkin .mceSplitButton a.mceAction, 
+.wp_themeSkin .mceSplitButton a.mceOpen {
+    background-color: #e9e8e8;
+    border-color: #83B4D5;
+}
+
+.wp_themeSkin .mceSplitButton a.mceOpen:hover,
+.wp_themeSkin .mceSplitButtonSelected a.mceOpen,
+.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,
+.wp_themeSkin .mceSplitButton a.mceAction:hover {
+    background-color: #d6d8da;
+    border-color: #7789ba !important;
+} 
+
+.wp_themeSkin .mceSplitButtonActive {
+    background-color: #d6d8da;
+}
+
+/* ColorSplitButton */
+.wp_themeSkin div.mceColorSplitMenu table {
+    background-color: #ebeaeb;
+    border-color: #808080;
+}
+
+.wp_themeSkin .mceColorSplitMenu a {
+    border-color: #808080;
+}
+
+.wp_themeSkin .mceColorSplitMenu a.mceMoreColors {
+    border-color: #fff;
+}
+
+.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {
+    border-color: #0A246A;
+    background-color: #B6BDD2;
+}
+
+.wp_themeSkin a.mceMoreColors:hover {
+    border-color: #0A246A;
+}
+
+/* Menu */
+.wp_themeSkin .mceMenu {
+    border-color: #ddd;
+}
+
+.wp_themeSkin .mceMenu table {
+    background-color: #ebeaeb;
+}
+
+.wp_themeSkin .mceMenu .mceText {
+    color: #000; 
+}
+
+.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover,
+.wp_themeSkin .mceMenu .mceMenuItemActive {
+    background-color: #83B4D5;
+}
+.wp_themeSkin td.mceMenuItemSeparator {
+    background-color: #aaa;
+}
+.wp_themeSkin .mceMenuItemTitle a {
+    background-color: #ccc; 
+    border-bottom-color: #aaa;
+}
+.wp_themeSkin .mceMenuItemTitle span.mceText {
+    color: #000;
+}
+.wp_themeSkin .mceMenuItemDisabled .mceText {
+    color: #888;
+}

trunk/wp-admin/css/colors-fresh.css

@@ -518 +518 @@
-    color: #888;
-}
+
+/* TinyMCE */
+.wp_themeSkin *,
+.wp_themeSkin a:hover, 
+.wp_themeSkin a:link, 
+.wp_themeSkin a:visited, 
+.wp_themeSkin a:active {
+     color: #000;
+}
+
+/* Containers */
+.wp_themeSkin table {
+    background: #cee1ef;
+}
+
+.wp_themeSkin iframe {
+    background: #fff;
+}
+
+/* Layout */
+.wp_themeSkin .mceStatusbar {
+     color:#000;
+     background-color: #eaf3fa;
+}
+
+/* Button */
+.wp_themeSkin .mceButton { 
+    background-color: #e9e8e8;
+    border-color: #abc0fb;
+}
+
+.wp_themeSkin a.mceButtonEnabled:hover,
+.wp_themeSkin a.mceButtonActive, 
+.wp_themeSkin a.mceButtonSelected {
+    background-color: #d6d8da;
+    border-color: #7789ba !important;
+}
+
+.wp_themeSkin .mceButtonDisabled {
+    border-color: #bdd !important;
+}
+
+/* ListBox */
+.wp_themeSkin .mceListBox .mceText,
+.wp_themeSkin .mceListBox .mceOpen  {
+    border-color: #abc0fb;
+    background-color: #e9e8e8;
+}
+
+.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, 
+.wp_themeSkin .mceListBoxHover .mceOpen,
+.wp_themeSkin .mceListBoxSelected .mceOpen,
+.wp_themeSkin .mceListBoxSelected .mceText {
+    border-color: #7789ba !important;
+    background-color: #d6d8da;
+}
+
+.wp_themeSkin table.mceListBoxEnabled:hover .mceText, 
+.wp_themeSkin .mceListBoxHover .mceText {
+    border-color: #7789ba !important;
+}
+
+.wp_themeSkin select.mceListBox {
+    border-color: #b3c7e1; 
+    background-color: #fff;
+}
+
+/* SplitButton */
+.wp_themeSkin .mceSplitButton a.mceAction, 
+.wp_themeSkin .mceSplitButton a.mceOpen {
+    background-color: #e9e8e8;
+    border-color: #abc0fb;
+}
+
+.wp_themeSkin .mceSplitButton a.mceOpen:hover,
+.wp_themeSkin .mceSplitButtonSelected a.mceOpen,
+.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction,
+.wp_themeSkin .mceSplitButton a.mceAction:hover {
+    background-color: #d6d8da;
+    border-color: #7789ba !important;
+} 
+
+.wp_themeSkin .mceSplitButtonActive {
+    background-color: #d6d8da;
+}
+
+/* ColorSplitButton */
+.wp_themeSkin div.mceColorSplitMenu table {
+    background-color: #ebeaeb;
+    border-color: #808080;
+}
+
+.wp_themeSkin .mceColorSplitMenu a {
+    border-color: #808080;
+}
+
+.wp_themeSkin .mceColorSplitMenu a.mceMoreColors {
+    border-color: #fff;
+}
+
+.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {
+    border-color: #0A246A;
+    background-color: #B6BDD2;
+}
+
+.wp_themeSkin a.mceMoreColors:hover {
+    border-color: #0A246A;
+}
+
+/* Menu */
+.wp_themeSkin .mceMenu {
+    border-color: #ddd;
+}
+
+.wp_themeSkin .mceMenu table {
+    background-color: #ebeaeb;
+}
+
+.wp_themeSkin .mceMenu .mceText {
+    color: #000; 
+}
+
+.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover,
+.wp_themeSkin .mceMenu .mceMenuItemActive {
+    background-color: #CEE1EF;
+}
+.wp_themeSkin td.mceMenuItemSeparator {
+    background-color: #aaa;
+}
+.wp_themeSkin .mceMenuItemTitle a {
+    background-color: #ccc; 
+    border-bottom-color: #aaa;
+}
+.wp_themeSkin .mceMenuItemTitle span.mceText {
+    color: #000;
+}
+.wp_themeSkin .mceMenuItemDisabled .mceText {
+    color: #888;
+}

trunk/wp-admin/css/ie.css

@@ -15 +15 @@
-
-* html #wpbody {
-6
+8
-}
-

trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css

@@ -1 +1 @@
-/* Reset */
-.wp_themeSkin table, .wp_themeSkin tbody, .wp_themeSkin a, .wp_themeSkin img, .wp_themeSkin tr, .wp_themeSkin div, .wp_themeSkin td, .wp_themeSkin iframe, .wp_themeSkin span, .wp_themeSkin *, .wp_themeSkin .mceText {
-background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000
-
- color:#000
+white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default
+
+
-.wp_themeSkin table td {vertical-align:middle}
-
-/* Containers */
-background:#83B4D5
- background:#FFF
+
+
-.wp_themeSkin .mceToolbar {padding: 2px;}
-
-/* External */
-:1px solid #ddd; border
+
-.wp_themeSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
-.wp_themeSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}
@@ -20 +20 @@
-.wp_themeSkin table.mceLayout {border:0;}
-.wp_themeSkin .mceIframeContainer {}
- color:#000; height:20px;background-color: #eaf3fa
+height:20px
-.wp_themeSkin .mceStatusbar div {float:left; padding:2px;}
-.wp_themeSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize}
@@ -26 +26 @@
-.wp_themeSkin table.mceToolbar {margin: 0 2px 2px;}
-.wp_themeSkin #content_toolbar1 {margin-top: 2px;}
-/*
-.wp_themeSkin .mceToolbar .mceToolbarStart span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px; }
-.wp_themeSkin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px}
-*/
-.wp_themeSkin .mceToolbar .mceToolbarEndListBox span {display:none}
-.wp_themeSkin span.mceIcon, .wp_themeSkin img.mceIcon {display:block; width:20px; height:20px}
@@ -42 +38 @@
-    padding: 1px 2px; 
-    margin: 1px; 
-
+
+
+
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    -khtml-border-radius: 3px;
-    border-radius: 3px;
-    border: 1px solid #83B4D5;
-}
-.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.mceButtonEnabled:hover {
-    background-color:#d6d8da;
-    background-position:0 -20px;
-    border: 1px solid #7789ba !important;
-}
-.wp_themeSkin a.mceButtonActive, .wp_themeSkin a.mceButtonSelected {
-    background-color: #d6d8da;
-    background-position:0 -20px;
-    border: 1px solid #7789ba !important;
-}
-.wp_themeSkin .mceButtonDisabled .mceIcon {opacity:0.3; filter:alpha(opacity=30);}
-border-color:#83B4D5;
+
-
-/* Separator */
@@ -78 +71 @@
-.wp_themeSkin .mceListBox .mceText {
-    padding: 1px 2px 1px 5px;
-    border: 1px solid #83B4D5;
-    text-align:left; 
-
-
-
+
+
+
+
+
-    font-family: Tahoma,Verdana,Arial,Helvetica; 
-    font-size: 11px; 
@@ -94 +88 @@
-}
-.wp_themeSkin .mceListBox .mceOpen {
-
-
-
-
+
+
+
+
+
+
-    padding: 1px;
-: 1px solid #83B4D5
+-left: 0 none !important
-}
-.wp_themeSkin .mceListBox .mceOpen span {
@@ -105 +101 @@
-    width:14px;
-    height:20px;
-
+
+
+
-}
-.wp_themeSkin table.mceListBoxEnabled:hover .mceText, 
-.wp_themeSkin .mceListBoxHover .mceText, 
-
-
-
-
-
-
+
-.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, 
-.wp_themeSkin .mceListBoxHover .mceOpen, 
-.wp_themeSkin .mceListBoxSelected .mceOpen {
-
-
+
-}
-.wp_themeSkin .mceListBoxDisabled .mceText {color:gray}
-.wp_themeSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
-.wp_themeSkin .mceOldBoxModel .mceListBox .mceText {height:22px}
- border:1px solid #b3c7e1; background:#FFF;
+
-
-/* SplitButton */
@@ -139 +131 @@
-    height:20px;
-    width:20px;
-
+
+
+
-    padding: 1px 2px;
-    border: 1px solid #83B4D5;
-}
-.wp_themeSkin .mceSplitButton span.mceAction {
@@ -151 +144 @@
-    height:20px;
-    border-collapse:separate;
-
+
+
+
-    padding: 1px;
-
-
+
-}
-.wp_themeSkin .mceSplitButton span.mceOpen {
-    width:10px; 
-
+
+
+
+
+
-}
-.wp_themeSkin .mceSplitButton a.mceOpen:hover,
-
-
-
-
-
-
-
-
-
-
+
+
-.wp_themeSkin .mceSplitButton a.mceAction:hover {
-
-
-
+
-}
-.wp_themeSkin table.mceSplitButtonEnabled:hover span.mceOpen, 
@@ -181 +169 @@
-}
-.wp_themeSkin .mceSplitButtonDisabled .mceAction {
-
-
-
-
+
-}
-.wp_themeSkin .mceListBox a.mceText, .wp_themeSkin .mceSplitButton a.mceAction {
@@ -208 +193 @@
-
-/* ColorSplitButton */
-background:#ebeaeb; border:1px solid gray
+
-.wp_themeSkin .mceColorSplitMenu td {padding:2px}
- border:1px solid #808080
+
-.wp_themeSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
- border:1px solid #FFF
-border:1px solid #0A246A; background-color:#B6BDD2
-border:1px solid #0A246A
+
+
+
-.wp_themeSkin .mceColorPreview {position:absolute; top:15px; left:2px; width:16px; height:4px; overflow:hidden}
-
-/* Menu */
- border:1px solid #ddd
+
-.wp_themeSkin .mceNoIcons span.mceIcon {width:0;}
-.wp_themeSkin .mceNoIcons a .mceText {padding-left:10px}
-background:#ebeaeb
+
-.wp_themeSkin .mceMenu a, .wp_themeSkin .mceMenu span, .wp_themeSkin .mceMenu {display:block}
-
-
+
+
+
+
+
+
-.wp_themeSkin .mceMenu .mceText {
-    position:relative; 
-    display:block; 
-    font-family:Tahoma,Verdana,Arial,Helvetica; 
-    color:#000; 
-    cursor:default; 
-    margin:0; 
- 0 25px; 
+;
-}
-.wp_themeSkin .mceMenu span.mceText, .wp_themeSkin .mceMenu .mcePreview {font-size:11px}
@@ -238 +226 @@
-.wp_themeSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
-.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover, 
-
-
-
-
+
+
-.wp_themeSkin .mceMenuItemTitle a {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-.wp_themeSkin .mceMenuItemSelected .mceIcon {background:url(../default/img/menu_check.gif)}
-.wp_themeSkin .mceNoIcons .mceMenuItemSelected a {background:url(../default/img/menu_arrow.gif) no-repeat -6px center}
@@ -349 +338 @@
-.wp_themeSkin span.mce_pagebreak {background-position:0 -40px}
-.wp_themeSkin .mce_spellchecker span.mceAction {background-position:-540px -20px}
+
+/* border */
+.wp_themeSkin .mceExternalToolbar, 
+.wp_themeSkin .mceButton, 
+.wp_themeSkin a.mceButtonEnabled:hover, 
+.wp_themeSkin a.mceButtonActive, 
+.wp_themeSkin a.mceButtonSelected, 
+.wp_themeSkin .mceListBox .mceText, 
+.wp_themeSkin .mceListBox .mceOpen, 
+.wp_themeSkin table.mceListBoxEnabled:hover .mceText, 
+.wp_themeSkin .mceListBoxHover .mceText, 
+.wp_themeSkin .mceListBoxSelected .mceText, 
+.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, 
+.wp_themeSkin .mceListBoxHover .mceOpen, 
+.wp_themeSkin .mceListBoxSelected .mceOpen, 
+.wp_themeSkin select.mceListBox, 
+.wp_themeSkin .mceSplitButton a.mceAction, 
+.wp_themeSkin .mceSplitButton a.mceOpen,
+.wp_themeSkin .mceSplitButton a.mceOpen:hover, 
+.wp_themeSkin .mceSplitButtonSelected a.mceOpen, 
+.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction, 
+.wp_themeSkin .mceSplitButton a.mceAction:hover, 
+.wp_themeSkin div.mceColorSplitMenu table, 
+.wp_themeSkin .mceColorSplitMenu a, 
+.wp_themeSkin .mceColorSplitMenu a.mceMoreColors, 
+.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover, 
+.wp_themeSkin a.mceMoreColors:hover, 
+.wp_themeSkin .mceMenu {
+    border-style: solid; 
+    border-width: 1px;
+}