Changeset 6575

Timestamp:

01/09/08 05:21:51 (8 months ago)

Author:

ryan

Message:

Purty editor buttons from andy. Removing some oogly. fixes #5573

Files:

• trunk/wp-includes/js/tinymce/themes/advanced/css/editor_ui.css (modified) (8 diffs)
• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (1 diff)

trunk/wp-includes/js/tinymce/themes/advanced/css/editor_ui.css

@@ -3 +3 @@
-.mceToolbarTop a, .mceToolbarTop a:visited, .mceToolbarTop a:hover, .mceToolbarBottom a, .mceToolbarBottom a:visited, .mceToolbarBottom a:hover {border: 0; margin: 0; padding: 0; background: transparent;}
-.mceSeparatorLine {border: 0; padding: 0; margin-left: 4px; margin-right: 2px;}
-7pt !important; font-weight: normal; margin-top: 3
+9pt !important; font-weight: normal; margin-top: 5
-.mceLabel, .mceLabelDisabled {font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; font-size: 9pt;}
-.mceLabel {color: #000000;}
@@ -10 +10 @@
-.mceEditorArea { font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; background: #FFFFFF; padding: 0; margin: 0; }
-.mceToolbarTop, .mceToolbarBottom {background: #cee1ef; line-height: 1px; font-size: 1px;}
--bottom: 1
+: 3px 2px 4
-.mceToolbarBottom {border-top: 1px solid #cccccc;}
-.mceToolbarContainer {display: block; position: relative; left: 0; top: 0; width: 100%;}
@@ -27 +27 @@
-/* Button CSS rules */
-
-a.mceButtonDisabled img, a.mceButtonNormal img, a.mceButtonSelected img {width: 20px; height: 20px; cursor: default; margin: 5px; background: #e9e8e8 url(../../../../../../../wp-admin/images/fade-butt.png); -moz-border-radius: 2px; border: 1px solid #ccc;
- {border: 0 !important
-F0F0EE
--color: #D4D5D8
+img.mceSeparatorLine { height: 24px; width: 0px; overflow: hidden; border-left: 1px solid #A7B0B7; margin: 0 3px; 
+, a.mceButtonNormal img, a.mceButtonSelected img {width: 20px; height: 20px; cursor: default; padding: 1px 2px; margin: 2px 2px 0; background: #e9e8e8 url(../../../../../../../wp-admin/images/fade-butt.png); -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; border: 1px solid #ccc
+B1B1B1
+: #D1D2D4
-a.mceButtonNormal img:hover, a.mceButtonSelected img:hover {border: 1px solid #0A246A !important; cursor: default; background-color: #B6BDD2;}
-F0F0EE
+c0c0c0
-a.mceTiledButton img {background-image: url('../images/buttons.gif'); background-repeat: no-repeat;}
-
-/* Menu button CSS rules */
-
-border: 1px solid #F0F0EE; margin-left: 1
+height: 20px; cursor: default; padding: 1px 2px; margin: 0 0 0 1px; background: #e9e8e8 url(../../../../../../../wp-admin/images/fade-butt.png); border: 1px solid #b1b1b1; -moz-border-radius: 4px 0 0 4px; -webkit-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4
-span.mceMenuButtonSelected img {border: 1px solid #6779AA; background-color: #B6BDD2;}
-span.mceMenuButtonSelected img.mceMenuButton {border: 1px solid #F0F0EE; background-color: transparent;}
-border-left: 0; margin-left:
+-moz-border-radius: 0 4px 4px 0; -webkit-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; border-left: 0; margin: 0 2px 0
-span.mceMenuButton:hover img, span.mceMenuButtonSelected:hover img {border: 1px solid #0A246A; background-color: #B6BDD2;}
-span.mceMenuButton:hover img.mceMenuButton, span.mceMenuButtonSelected:hover img.mceMenuButton {border-left: 0;}
-border: 1px solid gray; border-right: 0; margin-left:
-border: 1px solid gray; border-left: 1px solid #F5F4F2; margin-left:
+height: 20px; cursor: default; padding: 1px 2px; border: 1px solid #6779AA; -moz-border-radius: 4px 0 0 0; -webkit-border-radius: 4px 0 0 0; border-radius: 4px 0 0 0; margin: 0 0 0
+-moz-border-radius: 0 4px 0 0; -webkit-border-radius: 0 4px 0 0; border-radius: 0 4px 0 0; border-left: 0; margin: 0 2px 0
-span.mceMenuHover img {border: 1px solid #0A246A; background-color: #B6BDD2;}
-span.mceMenuButtonSelected.mceMenuHover img.mceMenuButton {border: 1px solid #0A246A; background-color: #B6BDD2; border-left: 0;}
@@ -50 +50 @@
-/* Menu */
-
- display: none; z-index: 1000; background-color: white; border: 1px solid gray
+display: none; z-index: 1000; background-color: white; border: 1px solid #6779AA
-.mceMenu a, .mceMenuTitle, .mceMenuDisabled {display: block; width: 100%; text-decoration: none; background-color: white; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; line-height: 20px; color: black;}
-.mceMenu a:hover {background-color: #B6BDD2; color: black; text-decoration: none !important;}
@@ -60 +60 @@
-span.mceMenuSelectedItem {background-image: url('../images/menu_check.gif'); background-repeat: no-repeat; background-position: 5px 8px; padding-left: 20px;}
-span.mceMenuCheckItem {padding-left: 20px;}
-0
+8
-.mceColors table, .mceColors td {margin: 0; padding: 2px;}
-a.mceMoreColors {width: auto; padding: 0; margin: 0 3px 3px 3px; text-align: center; border: 1px solid white; text-decoration: none !important;}
@@ -69 +69 @@
-/* MSIE 6 specific rules */
-
+/*
-* html a.mceButtonNormal img, * html a.mceButtonSelected img, * html a.mceButtonDisabled img {border: 0 !important; margin-top: 2px; margin-bottom: 1px;}
+*/
-* html a.mceButtonDisabled img {filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30); border: 0 !important;}
-* html a.mceButtonDisabled {border: 1px solid #F0F0EE !important;}
+/*
-* html a.mceButtonNormal, * html a.mceButtonSelected {border: 1px solid #F0F0EE !important; cursor: default;}
-* html a.mceButtonSelected {border: 1px solid #6779AA !important; background-color: #D4D5D8;}
@@ -78 +81 @@
-* html span.mceMenuButton, * html span.mceMenuButtonFocus {position: relative; left: 0; top: 0;}
-* html span.mceMenuButton img, * html span.mceMenuButtonSelected img, * html span.mceMenuButtonFocus img {position: relative; top: 1px;}
+*/
-* html a.mceMoreColors {width: auto;}
-* html .mceColors td a {width: 10px; height: 10px;}
@@ -84 +88 @@
-/* MSIE 7 specific rules */
-
+/*
-*:first-child+html a.mceButtonNormal img, *:first-child+html a.mceButtonSelected img, *:first-child+html a.mceButtonDisabled img {border: 0 !important; margin-top: 2px; margin-bottom: 1px;}
-
-
-
+
+
+
+
+
-*:first-child+html a.mceButtonSelected {border: 1px solid #6779AA !important; background-color: #D4D5D8;}
-*:first-child+html a.mceButtonNormal:hover, *:first-child+html a.mceButtonSelected:hover {border: 1px solid #0A246A !important; background-color: #B6BDD2; cursor: default;}
-
+
+
-*:first-child+html span.mceMenuButton, *:first-child+html span.mceMenuButtonFocus {position: relative; left: 0; top: 0;}
-*:first-child+html span.mceMenuButton img, *:first-child+html span.mceMenuButtonSelected img, *:first-child+html span.mceMenuButtonFocus img {position: relative; top: 1px;}
-
+
+
-*:first-child+html .mceColors td a {width: 10px; height: 10px;}
-*:first-child+html .mceColorPreview {margin: 0; padding-left: 4px; margin-top: 14px; width: 14px;}

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -88 +88 @@
-    gecko_spellcheck : true,
-    entities : "38,amp,60,lt,62,gt",
-tru
+fals
-    content_css : "<?php echo $mce_css; ?>",
-    valid_elements : "<?php echo $valid_elements; ?>",