diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index b02e535921..3f566a1b0a 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -1,4 +1,8 @@ +textarea, input, select { + border-color: #dfdfdf; +} + #sidemenu-bg, .find-box-search { background-color: #e4f2fd; @@ -10,9 +14,10 @@ a.page-numbers:hover { } body, +#wpbody, .form-table .pre, .find-box-inside { - background-color: #fff; + background-color: #f9f9f9; color: #333; } @@ -64,13 +69,24 @@ li.widget-list-control-item h4.widget-title a, color: #fff; } -li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links, - #poststuff h3, .metabox-holder h3, #replyhandle, -.login form, h3.info-box-title, #post-status-info, #screen-options-wrap, -#wpbody-content .describe tr, #edithead, #replyhead { +li.widget-list-control-item, +div.nav, +.tablenav, +#dashboard-widgets p.dashboard-widget-links, +#replyhandle, +.login form, h3.info-box-title, +#screen-options-wrap, +#wpbody-content .describe tr, +#edithead, +#replyhead { background-color: #eaf3fa; } +#poststuff h3, +.metabox-holder h3 { + background-color: #dfdfdf; +} + .form-table tr, .form-wrap .form-field { background-color: #f1f1f1; @@ -86,7 +102,7 @@ strong .post-com-count span { } #post-body ul#category-tabs li.ui-tabs-selected, -#quicktags, #login form .submit input, .search-box .button, +#login form .submit input, .search-box .button, #ed_reply_toolbar { background-color: #cee1ef !important; } @@ -364,7 +380,7 @@ h3.dashboard-widget-title small a:hover { color: #246; } -#adminmenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, .ui-sortable .postbox h3:hover span, a { +#adminmenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, a { color: #2583ad; } @@ -481,25 +497,27 @@ input.readonly { background-color: #fff; } -#poststuff #editor-toolbar { - background-color: #cee1ef; +.metabox-holder .postbox, +#poststuff .postbox, +#titlediv, +#poststuff .postarea, +#poststuff .stuffbox { + border-color: #dfdfdf; } -#poststuff #editor-toolbar .active { - background-color: #EAF3FA; - color: #333; -} - -.metabox-holder .postbox, #poststuff .postbox, #titlediv, #poststuff .postarea, #poststuff .stuffbox { - border-color: #ebebeb; - border-right-color: #ccc; - border-bottom-color: #ccc; -} - -.metabox-holder .postbox, #poststuff .postbox { +.metabox-holder .postbox, +#poststuff .postbox { background-color: #FFF; } +.ui-sortable .postbox h3 { + color: #555; +} + +.ui-sortable .postbox h3:hover { + color: #000; +} + .curtime #timestamp { background-image: url(../images/date-button.gif); } @@ -605,7 +623,34 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover color: #888; } +/* editors */ +#quicktags { + border-color: #dfdfdf; + background-color: #dfdfdf; +} + +#poststuff .wp_themeSkin .mceStatusbar { + border-color: #EDEDED; +} + +#poststuff #edButtonPreview, +#poststuff #edButtonHTML { + background-color: #f1f1f1; + border-color: #dfdfdf; + color: #999; +} + +#poststuff #editor-toolbar .active { + border-bottom-color: #e9e9e9; + background-color: #e9e9e9; + color: #333; +} + /* TinyMCE */ +#post-status-info { + background-color: #EDEDED; +} + .wp_themeSkin *, .wp_themeSkin a:hover, .wp_themeSkin a:link, @@ -616,7 +661,9 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover /* Containers */ .wp_themeSkin table, #wp_editbtns { + /* background: #cee1ef; + */ } .wp_themeSkin iframe { @@ -625,79 +672,79 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover /* Layout */ .wp_themeSkin .mceStatusbar { - color:#000; - background-color: #eaf3fa; + color: #000; + background-color: #f5f5f5; } /* Button */ .wp_themeSkin .mceButton { background-color: #e9e8e8; - border-color: #abc0fb; + border-color: #B2B2B2; } .wp_themeSkin a.mceButtonEnabled:hover, .wp_themeSkin a.mceButtonActive, .wp_themeSkin a.mceButtonSelected { - background-color: #d6d8da; - border-color: #7789ba !important; + background-color: #d5d5d5; + border-color: #777 !important; } .wp_themeSkin .mceButtonDisabled { - border-color: #bdd !important; + border-color: #ccc !important; } /* ListBox */ .wp_themeSkin .mceListBox .mceText, .wp_themeSkin .mceListBox .mceOpen { - border-color: #abc0fb; - background-color: #e9e8e8; + border-color: #B2B2B2; + background-color: #d5d5d5; } .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; + border-color: #777 !important; + background-color: #d5d5d5; } .wp_themeSkin table.mceListBoxEnabled:hover .mceText, .wp_themeSkin .mceListBoxHover .mceText { - border-color: #7789ba !important; + border-color: #777 !important; } .wp_themeSkin select.mceListBox { - border-color: #b3c7e1; + border-color: #B2B2B2; background-color: #fff; } /* SplitButton */ .wp_themeSkin .mceSplitButton a.mceAction, .wp_themeSkin .mceSplitButton a.mceOpen { - background-color: #e9e8e8; - border-color: #abc0fb; + background-color: #e8e8e8; + border-color: #B2B2B2; } .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; + background-color: #d5d5d5; + border-color: #777 !important; } .wp_themeSkin .mceSplitButtonActive { - background-color: #d6d8da; + background-color: #B2B2B2; } /* ColorSplitButton */ .wp_themeSkin div.mceColorSplitMenu table { - background-color: #ebeaeb; - border-color: #808080; + background-color: #ebebeb; + border-color: #B2B2B2; } .wp_themeSkin .mceColorSplitMenu a { - border-color: #808080; + border-color: #B2B2B2; } .wp_themeSkin .mceColorSplitMenu a.mceMoreColors { @@ -728,7 +775,7 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover .wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover, .wp_themeSkin .mceMenu .mceMenuItemActive { - background-color: #CEE1EF; + background-color: #f5f5f5; } .wp_themeSkin td.mceMenuItemSeparator { background-color: #aaa; @@ -744,9 +791,14 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover color: #888; } +.wp_themeSkin tr.mceFirst { + background-color: #dfdfdf; + border-color: #dfdfdf; +} + /* pop-up */ .clearlooks2 .mceTop .mceLeft, .clearlooks2 .mceTop .mceRight { - background-color: #cee1ef; + background-color: #f5f5f5; border-color: #c6d9e9; } @@ -756,12 +808,14 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover } /* end TinyMCE */ -#editorcontainer, #post-status-info { - border-color: #ccc; +#editorcontainer, +#post-status-info, +#poststuff #titlewrap { + border-color: #dfdfdf; } #poststuff #titlewrap { - border-color: #ccc; + background-color: #fff; } #tTips p#tTips_inside { diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css index be0fce360c..eb08bc3058 100644 --- a/wp-admin/css/global.css +++ b/wp-admin/css/global.css @@ -97,6 +97,8 @@ textarea, input, select { font: 13px Verdana, Arial, Helvetica, sans-serif; margin: 1px; padding: 3px; + border-width: 1px; + border-style: solid; } .alignleft { diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css index 1d37bc52fd..7ec90986cb 100644 --- a/wp-admin/css/ie.css +++ b/wp-admin/css/ie.css @@ -158,10 +158,8 @@ p.search-box { padding: 0; } -* html #editorcontainer #content { - position: relative; +#editorcontainer #content { overflow: auto; - padding: 6px; margin: auto; width: 98%; } diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index b37746d412..c7df2df14d 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -508,7 +508,6 @@ else
-

@@ -526,9 +525,7 @@ endif; ?>
-
- -

+ post_content); ?> diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php index 9921ee58c6..0cd4b26f8b 100644 --- a/wp-admin/edit-form-comment.php +++ b/wp-admin/edit-form-comment.php @@ -18,6 +18,7 @@ $form_extra = "' />\ncomment_ID) ?>
+

diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php index b1b7f7f8cd..63ee133437 100644 --- a/wp-admin/edit-page-form.php +++ b/wp-admin/edit-page-form.php @@ -394,7 +394,6 @@ $side_meta_boxes = do_meta_boxes('page', 'side', $post);
-

@@ -410,9 +409,6 @@ endif; ?>
-
- -

post_content); ?>
@@ -433,7 +429,6 @@ endif; ?>
- diff --git a/wp-admin/images/ed-bg.gif b/wp-admin/images/ed-bg.gif new file mode 100644 index 0000000000..a00467c297 Binary files /dev/null and b/wp-admin/images/ed-bg.gif differ diff --git a/wp-admin/images/postbox-bg.gif b/wp-admin/images/postbox-bg.gif new file mode 100644 index 0000000000..02210fee84 Binary files /dev/null and b/wp-admin/images/postbox-bg.gif differ diff --git a/wp-admin/images/resize.gif b/wp-admin/images/resize.gif new file mode 100644 index 0000000000..6a1b41cdaf Binary files /dev/null and b/wp-admin/images/resize.gif differ diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index c9b31ca4ed..099a59a771 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -320,15 +320,15 @@ if ( is_string($content_func) ) function media_buttons() { global $post_ID, $temp_ID; $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID); - $context = apply_filters('media_buttons_context', __('Add media: %s')); + $context = apply_filters('media_buttons_context', __('Upload %s')); $media_upload_iframe_src = "media-upload.php?post_id=$uploading_iframe_ID"; - $media_title = __('Add Media'); + $media_title = __('Upload Media'); $image_upload_iframe_src = apply_filters('image_upload_iframe_src', "$media_upload_iframe_src&type=image"); - $image_title = __('Add an Image'); + $image_title = __('Upload an Image'); $video_upload_iframe_src = apply_filters('video_upload_iframe_src', "$media_upload_iframe_src&type=video"); - $video_title = __('Add Video'); + $video_title = __('Upload Video'); $audio_upload_iframe_src = apply_filters('audio_upload_iframe_src', "$media_upload_iframe_src&type=audio"); - $audio_title = __('Add Audio'); + $audio_title = __('Upload Audio'); $out = <<$image_title diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index 2af237300e..97c80f8efe 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -1141,8 +1141,8 @@ function wp_tiny_mce( $teeny = false ) { 'paste_remove_styles' => true, 'gecko_spellcheck' => true, 'entities' => '38,amp,60,lt,62,gt', - 'accessibility_focus' => false, - 'tab_focus' => ':next', + 'accessibility_focus' => true, + 'tab_focus' => ':prev,:next', 'content_css' => "$mce_css", 'save_callback' => 'switchEditors.saveCallback', 'wpeditimage_disable_captions' => $no_captions, diff --git a/wp-admin/js/editor.js b/wp-admin/js/editor.js index 8ef6611c6c..ac4f58a919 100644 --- a/wp-admin/js/editor.js +++ b/wp-admin/js/editor.js @@ -16,7 +16,6 @@ switchEditors = { try { this.I('content').style.height = h.ch - 30 + 'px'; } catch(e){}; } else { try { - this.I('editorcontainer').style.padding = '0px'; this.I("quicktags").style.display = "none"; } catch(e){}; tinyMCE.execCommand("mceAddControl", false, "content"); @@ -100,7 +99,6 @@ switchEditors = { var H = this.I('edButtonHTML'); var P = this.I('edButtonPreview'); var ta = this.I(id); - var ec = (ta.parentNode && ta.parentNode.nodeName == 'DIV') ? ta.parentNode : ''; if ( 'tinymce' == mode ) { @@ -115,9 +113,6 @@ switchEditors = { edCloseAllTags(); // :-( qt.style.display = 'none'; - ta.style.padding = '0px'; - if ( ec ) - ec.style.padding = '0px'; ta.value = this.wpautop(ta.value); @@ -138,17 +133,6 @@ switchEditors = { ed.hide(); qt.style.display = 'block'; - if ( tinymce.isIE6 ) { - ta.style.width = '98%'; - if ( ec ) - ec.style.padding = '0px'; - ta.style.padding = '6px'; - } else { - ta.style.width = '100%'; - if ( ec ) - ec.style.padding = '6px'; - } - ta.style.color = ''; setUserSetting( 'editor', 'html' ); } diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 955e1da73e..5b125787c1 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -298,6 +298,7 @@ table#availablethemes td.bottom { -khtml-border-radius: 11px; -webkit-border-radius: 11px; border-radius: 11px; + -moz-box-sizing: content-box; } a.button { @@ -377,6 +378,10 @@ textarea.all-options, input.all-options { width: 94%; } +#wpbody-content .metabox-holder { + padding-top: 10px; +} + #postdivrich { margin: 0; padding: 0; @@ -388,26 +393,40 @@ textarea.all-options, input.all-options { } #editorcontainer #content { - padding: 0; + padding: 6px; line-height: 150%; border: 0 none; outline: none; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; } -#editorcontainer { - padding: 6px; - border-style: none solid solid; +#editorcontainer, +#quicktags { + border-style: solid; border-width: 1px; border-collapse: separate; + -moz-border-radius: 6px 6px 0 0; + -webkit-border-top-right-radius: 6px; + -webkit-border-top-left-radius: 6px; + -khtml-border-top-right-radius: 6px; + -khtml-border-top-left-radius: 6px; + border-top-right-radius: 6px; + border-top-left-radius: 6px; } #quicktags { padding: 0; - border: 0 none; + margin-bottom: -3px; + border-bottom-width: 3px; + background-image: url("images/ed-bg.gif"); + background-position: left top; + background-repeat: repeat-x; } #quicktags #ed_toolbar { - padding: 2px 4px; + padding: 2px 4px 0; } #ed_toolbar input { @@ -1323,15 +1342,36 @@ table.form-table td .updated { #post-status-info { font-size: 12px; line-height: 2; - padding: 0 7px; - border: 1px solid; - border-top: none; + padding: 0 15px 0 7px; + border-width: 0 1px 1px; + border-style: none solid solid; + -moz-border-radius: 0 0 6px 6px; + -webkit-border-bottom-left-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -khtml-border-bottom-left-radius: 6px; + -khtml-border-bottom-right-radius: 6px; + border-bottom-left-radius: 6px; + border-bottom-right-radius: 6px; } #editorcontent #post-status-info { border: none; } +#post-body-content .wp_themeSkin .mceStatusbar a.mceResize { + display: block; + float: right; + background: transparent url(images/resize.gif) no-repeat scroll right bottom; + width: 12px; + height: 12px; + cursor: se-resize; + margin: 0 2px; + position: relative; + right: 0; + top: 31px; +} + + #pagesubmitdiv div.inside, #linksubmitdiv div.inside, div.inside { @@ -1423,18 +1463,32 @@ table.form-table td .updated { clear: left; } -#poststuff h3, .metabox-holder h3 { - font-size: 14px; +#poststuff h3, +.metabox-holder h3 { + font-size: 12px; font-weight: bold; - padding: 7px; + padding: 6px 7px; margin: 0 0 10px; } -.metabox-holder .postbox, #poststuff .postbox, #poststuff .stuffbox { - padding: 2px; +.metabox-holder .postbox, +#poststuff .postbox, +#poststuff .stuffbox { margin-bottom: 20px; border-width: 1px; border-style: solid; + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; +} + +.metabox-holder .postbox h3, +#poststuff .postbox h3, +#poststuff .stuffbox h3 { + background-image: url("images/postbox-bg.gif"); + background-position: left top; + background-repeat: repeat-x; } #poststuff .inside { @@ -1464,9 +1518,13 @@ table.form-table td .updated { } #poststuff #titlewrap { - padding: 2px 3px; + padding: 3px 4px; border-width: 1px; border-style: solid; + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; } #poststuff .inside-submitbox, @@ -1491,11 +1549,16 @@ table.form-table td .updated { #edit-slug-box { margin-top: 8px; + padding: 0 7px; } -#editable-post-name-full { display: none; } +#editable-post-name-full { + display: none; +} -#editable-post-name input { width: 16em; } +#editable-post-name input { + width: 16em; +} #edit-slug-buttons a.save { padding: 6px 4px; @@ -1522,47 +1585,53 @@ table.form-table td .updated { } #poststuff #editor-toolbar { - clear: both; - position: relative; - margin-top: -10px; -} -#poststuff #editor-toolbar #edButtonHTML, #poststuff #editor-toolbar #edButtonPreview { - position: relative; - top: -5px; + height: 30px; } -#poststuff #edButtonPreview, #poststuff #edButtonHTML { +.wp_themeSkin tr.mceFirst { + background-image: url("images/ed-bg.gif"); + background-position: left top; + background-repeat: repeat-x; + border-width: 0 0 1px; + border-style: none none solid; +} + +#poststuff #edButtonPreview, +#poststuff #edButtonHTML { display: block; - height: 20px; - padding: 5px 5px 1px; - margin: 5px 8px 0 0; + height: 18px; + margin: 5px 5px 0 0; + padding: 4px 5px 2px; float: right; cursor: pointer; + border-width: 1px; + border-style: solid; + -moz-border-radius: 3px 3px 0 0; + -webkit-border-top-right-radius: 3px; + -webkit-border-top-left-radius: 3px; + -khtml-border-top-right-radius: 3px; + -khtml-border-top-left-radius: 3px; + border-top-right-radius: 3px; + border-top-left-radius: 3px; +} + +#poststuff #edButtonHTML { + margin-right: 15px; } #poststuff #editor-toolbar .active { - font-weight: bold; - -moz-border-radius: 0 0 3px 3px; - -webkit-border-bottom-right-radius: 3px; - -webkit-border-bottom-left-radius: 3px; - -khtml-border-bottom-right-radius: 3px; - -khtml-border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - border-bottom-left-radius: 3px; + /*font-weight: bold;*/ } #poststuff #media-buttons { - float: right; - margin-right: 20px; - margin-top: 8px; cursor: default; - line-height: 1; - height: 1.1em; + padding: 8px 8px 0; } #poststuff #media-buttons a { cursor: pointer; - padding: 0 5px 2px 2px; + padding: 0 0 5px 10px; + vertical-align: middle; } #poststuff #media-buttons img { diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 593251e2ea..863b5e3566 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -1494,11 +1494,11 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button + if ( $media_buttons ) { ?>
- +
@@ -1519,19 +1519,17 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button // If tinyMCE is defined. if ( typeof tinyMCE != 'undefined' ) { // This code is meant to allow tabbing from Title to Post (TinyMCE). - document.getElementById('').onkeydown = function (e) { - e = e || window.event; - if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) { - if ( tinyMCE.activeEditor ) { - if ( (jQuery("#post_ID").val() < 1) && (jQuery("#title").val().length > 0) ) { autosave(); } - e = null; - if ( tinyMCE.activeEditor.isHidden() ) return true; + jQuery('#').keydown(function (e) { + if (e.which == 9 && !e.shiftKey && !e.controlKey && !e.altKey) { + if ( (jQuery("#post_ID").val() < 1) && (jQuery("#title").val().length > 0) ) { autosave(); } + if ( tinyMCE.activeEditor && ! tinyMCE.activeEditor.isHidden() ) { tinyMCE.activeEditor.focus(); + e.preventDefault(); return false; } - return true; + return; } - } + }); } // ]]> diff --git a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png index df9043959d..adb83cdbbf 100644 Binary files a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png and b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png differ diff --git a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css index 70622412d8..a2d90539bc 100644 --- a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css +++ b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css @@ -19,9 +19,25 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we .wp_themeSkin table.mceToolbar, .wp_themeSkin tr.mceFirst .mceToolbar tr td, .wp_themeSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0} .wp_themeSkin table.mceLayout {border:0;} .wp_themeSkin .mceIframeContainer {} -.wp_themeSkin .mceStatusbar {display:block; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible;height:20px;} +.wp_themeSkin .mceStatusbar { + display: block; + font-family: 'MS Sans Serif',sans-serif,Verdana,Arial; + font-size: 9pt; + line-height: 16px; + overflow: visible; + height: 20px; + border-top-width: 1px; + border-top-style: solid; +} .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} +.wp_themeSkin .mceStatusbar a.mceResize { + display: block; + float: right; + background: url(../../img/icons.gif) -800px 0; + width: 20px; + height: 20px; + cursor: se-resize +} .wp_themeSkin .mceStatusbar a:hover {text-decoration:underline} .wp_themeSkin table.mceToolbar {margin: 0 2px 2px;} .wp_themeSkin #content_toolbar1 {margin-top: 2px;} @@ -38,8 +54,8 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we padding: 1px 2px; margin: 1px; background-image: url(img/butt2.png); - background-position: 2px 1px; - background-repeat: no-repeat; + background-position: left top; + background-repeat: repeat-x; -moz-border-radius: 3px; -webkit-border-radius: 3px; -khtml-border-radius: 3px; @@ -48,10 +64,10 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we .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-position:0 -20px; + background-position:0 -10px; } .wp_themeSkin a.mceButtonActive, .wp_themeSkin a.mceButtonSelected { - background-position:0 -20px; + background-image: inherit; } .wp_themeSkin .mceButtonDisabled .mceIcon {opacity:0.3; filter:alpha(opacity=30);} .wp_themeSkin .mceButtonDisabled {} @@ -74,7 +90,7 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we text-decoration: none !important; width:70px; background-image: url(img/butt2.png); - background-position: 1px 1px; + background-position: left top; background-repeat: repeat-x; font-family: Tahoma,Verdana,Arial,Helvetica; font-size: 11px; @@ -91,7 +107,7 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we height: 20px; border-collapse: separate; background-image: url(img/butt2.png); - background-position: 1px 1px; + background-position: left top; background-repeat: repeat-x; padding: 1px; border-left: 0 none !important; @@ -131,7 +147,7 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we height:20px; width:20px; background-image: url(img/butt2.png); - background-position: 1px 1px; + background-position: left top; background-repeat: repeat-x; padding: 1px 2px; } @@ -144,7 +160,7 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we height:20px; border-collapse:separate; background-image: url(img/butt2.png); - background-position: 1px 1px; + background-position: left top; background-repeat: repeat-x; padding: 1px; border-left: 0 none !important; diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index a2bb1e1374..22115d9a45 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -61,7 +61,7 @@ function wp_default_scripts( &$scripts ) { // Modify this version when tinyMCE plugins are changed. function mce_version() { - return '20080930'; + return '20081028'; } add_filter( 'tiny_mce_version', 'mce_version' ); @@ -277,7 +277,7 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'dashboard', '/wp-admin/js/dashboard.js', array( 'jquery', 'admin-comments', 'postbox', 'settings-box' ), '20081016' ); $scripts->add( 'hoverIntent', '/wp-includes/js/hoverIntent.js', array('jquery'), '20070327' ); - $scripts->add( 'menu', '/wp-admin/js/menu.js', array( 'jquery', 'hoverIntent' ), '20081023' ); + $scripts->add( 'menu', '/wp-admin/js/menu.js', array( 'jquery', 'hoverIntent' ), '20081028' ); } }