diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 0b4d0ebb50..c34e209651 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -1,5 +1,4 @@ -#sidemenu-bg, .find-box-search { background-color: #e4f2fd; border-color: #c6d9e9; @@ -42,7 +41,8 @@ div.dashboard-widget-notice { background-color: #cfe1ef; } -div.dashboard-widget-submit, ul.widget-control-list div.widget-control-actions { +div.dashboard-widget-submit, +ul.widget-control-list div.widget-control-actions { border-top-color: #ccc; } @@ -50,17 +50,21 @@ div.ui-tabs-panel { border-color: #cee1ef; } -input.disabled, textarea.disabled { +input.disabled, +textarea.disabled { background-color: #ccc; } li.widget-list-control-item h4.widget-title a:hover, -#footer a, #upload-menu li a.upload-tab-link, +#footer a, +#upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, #draghelper li.widget-list-control-item h4.widget-title a:visited, -.login #backtoblog a:hover, #plugin-information .action-button a, -#plugin-information .action-button a:hover, #plugin-information .action-button a:visited { +.login #backtoblog a:hover, +#plugin-information .action-button a, +#plugin-information .action-button a:hover, +#plugin-information .action-button a:visited { color: #fff; } @@ -260,12 +264,22 @@ ul#widget-list li.widget-list-item h4.widget-title { border-color: #535353; } -.button:hover, .button-secondary:hover, #wphead #viewsite a:hover, -#adminmenu a:hover, #adminmenu ul.wp-submenu a:hover, #the-comment-list .comment a:hover, -#rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, -#login form .submit input:hover, div.dashboard-widget-submit input:hover, -#edit-slug-buttons a.save:hover, #media-upload a.delete:hover, -#media-upload a.del-link:hover, .ui-tabs-nav a:hover, #user_info a:hover { +.button:hover, +#wphead #viewsite a:hover, +#adminmenu a:hover, +#adminmenu ul.wp-submenu a:hover, +#the-comment-list .comment a:hover, +#rightnow a:hover, +a:hover, +.subsubsub a:hover, +.subsubsub a.current:hover, +#login form .submit input:hover, +div.dashboard-widget-submit input:hover, +#edit-slug-buttons a.save:hover, +#media-upload a.delete:hover, +#media-upload a.del-link:hover, +.ui-tabs-nav a:hover, +#user_info a:hover { color: #d54e21; } @@ -316,20 +330,24 @@ ul#widget-list li.widget-list-item h4.widget-title { border-color: #e4f2fd; } -.tablenav .next, .tablenav .prev{ +.tablenav .next, +.tablenav .prev { background-color: #e4f2fd; border-bottom-color: #2583ad; border-color: #e4f2fd; color: #2583ad; } -.tablenav .next:hover, .tablenav .prev:hover { +.tablenav .next:hover, +.tablenav .prev:hover { border-bottom-color: #d54e21; border-color: #e4f2fd; color: #d54e21; } -.updated, .login #login_error, .login .message { +.updated, +.login #login_error, +.login .message { background-color: #ffffe0; border-color: #e6db55; } @@ -342,11 +360,14 @@ a.page-numbers { border-bottom-color: #B8D3E2; } -div#available-widgets-filter, ul#widget-list li.widget-list-item, .commentlist li { +div#available-widgets-filter, +ul#widget-list li.widget-list-item, +.commentlist li { border-bottom-color: #ccc; } -.widefat td, .widefat th { +.widefat td, +.widefat th { border-color: #dfdfdf; } @@ -370,17 +391,25 @@ h3.dashboard-widget-title small a:hover { color: #fff; } -.widget-control-save, .widget-control-remove { +.widget-control-save, +.widget-control-remove { background-color: #cee1ef; 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, 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; } /* Because we don't want visited on these links */ -body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover { +body.press-this .ui-tabs-selected a, +body.press-this .ui-tabs-selected a:hover { background-color: #fff; border-color: #c6d9e9; border-bottom-color: #fff; @@ -391,16 +420,21 @@ body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover { background-image: url(../images/comment-stalk-fresh.gif); } -#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span, #rightnow .reallynow, #plugin-information .action-button { +#adminmenu li a #awaiting-mod span, +#sidemenu li a #update-plugins span, +#rightnow .reallynow, +#plugin-information .action-button { background-color: #d54e21; color: #fff; } -#adminmenu li a:hover #awaiting-mod span, #sidemenu li a:hover #update-plugins span { +#adminmenu li a:hover #awaiting-mod span, +#sidemenu li a:hover #update-plugins span { background-color: #264761; } -div#media-upload-header, div#plugin-information-header { +div#media-upload-header, +div#plugin-information-header { background-color: #e4f2fd; border-bottom-color: #c6d9e9; } @@ -421,7 +455,9 @@ input.readonly { background-color: #ddd; } -#dragHelper h4.widget-title, li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4 { +#dragHelper h4.widget-title, +li.widget-list-control-item h4, +#dragHelper li.widget-list-control-item h4 { background-color: #2683ae; color: #fff; } @@ -439,7 +475,8 @@ input.readonly { color: #777; } -#footer, #footer-upgrade { +#footer, +#footer-upgrade { background: #464646; color: #999; } @@ -473,7 +510,9 @@ input.readonly { border-color: #8dff1c !important; } -.checkbox, .side-info, #your-profile #rich_editing { +.checkbox, +.side-info, +#your-profile #rich_editing { background-color: #fff; } @@ -555,7 +594,8 @@ input.readonly { border-bottom-color: #69c; } -#upload-menu li #current-tab-nav, #upload-file { +#upload-menu li #current-tab-nav, +#upload-file { background-color: #f9fcfe; } @@ -568,12 +608,14 @@ input.readonly { color: #000; } -#upload-menu li.current a.upload-tab-link, #upload-menu li a:hover { +#upload-menu li.current a.upload-tab-link, +#upload-menu li a:hover { background-color: #f9fcfe; color: #000; } -#upload-menu, #upload-menu li { +#upload-menu, +#upload-menu li { border-top-color: #247fab; } @@ -611,7 +653,11 @@ body.login { } -div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover, .delete:hover { +div#media-upload-error, +.file-error, +abbr.required, +.widget-control-remove:hover, +.delete:hover { color: #f00; } @@ -802,12 +848,14 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover } /* pop-up */ -.clearlooks2 .mceTop .mceLeft, .clearlooks2 .mceTop .mceRight { +.clearlooks2 .mceTop .mceLeft, +.clearlooks2 .mceTop .mceRight { background-color: #f5f5f5; border-color: #c6d9e9; } -.clearlooks2 .mceFocus .mceTop .mceLeft, .clearlooks2 .mceFocus .mceTop .mceRight { +.clearlooks2 .mceFocus .mceTop .mceLeft, +.clearlooks2 .mceFocus .mceTop .mceRight { background-color: #2683ae; border-color: #464646; } @@ -832,8 +880,77 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover border-color: #ddd; } -/* Diff */ +/* menu */ +#adminmenu * { + border-color: #e3e3e3; +} +#adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px; +} + +#adminmenu.folded li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px; +} + +#adminmenu li.wp-has-current-submenu .wp-menu-toggle, +#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { + background: transparent url(../images/menu-bits.gif) repeat-x scroll left -206px; +} + +#adminmenu .wp-has-submenu:hover .wp-menu-toggle, +#adminmenu .wp-menu-open .wp-menu-toggle { + background: transparent url(../images/menu-bits.gif) repeat-x scroll left -108px; +} + +#adminmenu a.wp-has-submenu { + background: #f1f1f1 url(../images/menu-bits.gif) repeat-x scroll left -379px; +} + +#adminmenu .wp-submenu a { + background: #FFFFFF url(../images/menu-bits.gif) no-repeat scroll 0 -310px; +} + +#adminmenu li.current a, +#adminmenu .wp-submenu a:hover { + background: transparent url(../images/menu-bits.gif) no-repeat scroll 0 -289px; +} + +#adminmenu li.wp-has-current-submenu a.wp-has-submenu { + background: #b5b5b5 url(../images/menu-bits.gif) repeat-x scroll left top; + color: #fff; +} + +#adminmenu .wp-submenu a:hover { + background-color: #EAF2FA; + color: #333 !important; +} + +#adminmenu li.current a, +#adminmenu li.current a:hover { + color: #d54e21; + background-color: #fff; +} + +#adminmenu .wp-submenu { + background-color: #fff; +} + +#adminmenu.folded li.wp-has-submenu { + background-color: #F1F1F1; +} + +#adminmenu .wp-submenu li.wp-submenu-head { + background-color: #F1F1F1; +} + +#adminmenu.folded .wp-submenu { + background-color: #fff; +} +/* end menu */ + + +/* Diff */ table.diff .diff-deletedline { background-color: #ffdddd; } diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css index 7ec90986cb..3d6bd6332c 100644 --- a/wp-admin/css/ie.css +++ b/wp-admin/css/ie.css @@ -56,6 +56,9 @@ input.button, input.button-secondary, input.button-highlighted { #adminmenu { z-index: 1; + width: 125px; + float: none; + background-color: f1f1f1; } #adminmenu li.wp-has-submenu { @@ -64,14 +67,17 @@ input.button, input.button-secondary, input.button-highlighted { } #adminmenu a.wp-has-submenu { - +display: block; } -ul.wp-submenu, ul.wp-submenu li, +#adminmenu, +#adminmenu .wp-menu-toggle, +ul.wp-submenu, +ul.wp-submenu li, ul.wp-submenu a, #adminmenu a.wp-has-submenu, #adminmenu .wp-menu-image { - display: block; + zoom: 100%; } @@ -111,12 +117,16 @@ ul#adminmenu li.wp-menu-separator { */ -#template, #template div, #editcat, #addcat { +#template, +#template div, +#editcat, +#addcat { zoom: 100%; } -* html #poststuff .postarea, * html #poststuff #titlediv { +* html #poststuff .postarea, +* html #poststuff #titlediv { } @@ -124,12 +134,33 @@ ul#adminmenu li.wp-menu-separator { margin-top: 10px; } -* html div.widget-liquid-left-holder, * html div.widget-liquid-right { +* html div.widget-liquid-left-holder, +* html div.widget-liquid-right { display: block; position: relative; } -#wpwrap, #wpcontent, #post, #wrap, #postdivrich, #postdiv, #poststuff, .metabox-holder, #titlediv, #post-body, #editorcontainer, .tablenav, .widget-control-list, li.widget-list-control-item, #dragHelper, li.widget-list-control-item h4, .widget-sortable, .widget-control-actions, #tagchecklist { +#wpwrap, +#wpcontent, +#post, #wrap, +#postdivrich, +#postdiv, +#poststuff, +.metabox-holder, +#titlediv, +#post-body, +#editorcontainer, +.tablenav, +.widget-control-list, +li.widget-list-control-item, +#dragHelper, +li.widget-list-control-item h4, +.widget-sortable, +.widget-control-actions, +#tagchecklist, +#col-container, +#col-left, +#col-right { display: block; zoom: 100%; } diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index f01636282e..0c71449378 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -551,7 +551,8 @@ function add_menu_page( $page_title, $menu_title, $access_level, $file, $functio if ( empty($icon_url) ) $icon_url = 'images/menu/generic.png'; - $menu[] = array ( $menu_title, $access_level, $file, $page_title, $hookname, $hookname, $icon_url ); + $menu[] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top-single ' . $hookname, $hookname, $icon_url ); + $menu[] = array ( '', $access_level, '', '', 'wp-menu-separator-last' ); return $hookname; } diff --git a/wp-admin/js/menu.js b/wp-admin/js/menu.js index 11b1a51383..afd43561f2 100644 --- a/wp-admin/js/menu.js +++ b/wp-admin/js/menu.js @@ -64,7 +64,15 @@ adminMenu = { if ( $.browser.msie && $.browser.version.charAt(0) == 6 ) $('#wpbody-content').css('marginLeft', '60px'); $('#adminmenu li.wp-has-submenu').css({'width':'28px'}).hoverIntent({ - over: function(){ $(this).find('.wp-submenu').show(); }, + over: function(e){ + var m = $(this).find('.wp-submenu'), t = e.clientY, H = $(window).height(), h = m.height(), o; + + if ( (t+h+10) > H ) { + o = (t+h+10) - H; + m.css({'marginTop':'-'+o+'px'}) + } + m.show(); + }, out: function(){ $(this).find('.wp-submenu').hide(); }, timeout: 220, sensitivity: 8, diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index b4a2fc454d..4ac86745b7 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -789,11 +789,6 @@ ul#adminmenu li.write-new-button a { } /* menu stuff */ - -#adminmenu * { - border-color: #e3e3e3; -} - #adminmenu .wp-submenu { display: none; list-style: none; @@ -805,6 +800,7 @@ ul#adminmenu li.write-new-button a { #adminmenu { padding: 0; list-style: none; + font: normal 11.5px/16px Georgia, "Times New Roman", Times, serif; } #adminmenu li.wp-menu-open .wp-submenu { @@ -827,7 +823,7 @@ ul#adminmenu li.write-new-button a { #adminmenu a { display: block; - font-size: 12px !important; + font-size: 11.5px !important; line-height: 18px; padding: 1px 5px 3px; } @@ -842,12 +838,9 @@ ul#adminmenu li.write-new-button a { padding: 6px 5px; border-width: 1px 1px 0; border-style: solid solid none; - background: #f1f1f1 url(images/menu-bits.gif) repeat-x scroll left -379px; } #adminmenu li.wp-has-current-submenu a.wp-has-submenu { - background: #b5b5b5 url(images/menu-bits.gif) repeat-x scroll left top; - color: #fff; font-style: italic; } @@ -856,20 +849,6 @@ ul#adminmenu li.write-new-button a { padding-left: 12px; border-width: 0 1px 0 0; border-style: none solid none none; - background: #FFFFFF url(images/menu-bits.gif) no-repeat scroll 0 -310px; -} - -#adminmenu li.current a, -#adminmenu .wp-submenu a:hover { - background-image: url(images/menu-bits.gif); - background-repeat: no-repeat; - background-position: 0 -289px; - background-attachment: scroll; -} - -#adminmenu li.current a { - color: #333; - background-color: #EAF2FA; } #adminmenu .menu-top-last ul.wp-submenu, @@ -882,10 +861,8 @@ ul#adminmenu li.write-new-button a { margin: 0; position: relative; z-index: 2; - border-width: 1px 0 0; border-style: solid none none; - background-color: #fff; } #adminmenu .wp-submenu li { @@ -960,21 +937,12 @@ ul#adminmenu li.write-new-button a { padding: 7px 0 0 6px; } -#adminmenu .wp-submenu li.current { - background-color: #fff; -} - #adminmenu li.wp-menu-separator { - background: transparent url(images/menu-arrows.gif) no-repeat scroll left 5px; height: 21px; padding: 0; margin: 0; } -#adminmenu.folded li.wp-menu-separator { - background: transparent url(images/menu-arrows.gif) no-repeat scroll right -34px; -} - #adminmenu .wp-menu-separator-last { height: 10px; width: 1px; @@ -985,10 +953,6 @@ ul#adminmenu li.write-new-button a { border-style: solid; padding: 6px 4px 6px 10px; cursor: default; - - - - background-color:#F1F1F1; } #adminmenu.folded .wp-submenu { @@ -998,10 +962,6 @@ ul#adminmenu li.write-new-button a { width: 135px; border-width: 0 0 1px; border-style: none none solid; - - - - background-color: #fff; } #adminmenu.folded .wp-submenu li.wp-first-item { @@ -1023,19 +983,11 @@ ul#adminmenu li.write-new-button a { height: 29px; padding: 1px 2px 0 0; } - -#adminmenu li.wp-has-current-submenu .wp-menu-toggle, -#adminmenu li.wp-has-current-submenu:hover div.wp-menu-toggle { - background: transparent url(images/menu-bits.gif) repeat-x scroll left -206px; -} - -#adminmenu li.wp-has-submenu:hover .wp-menu-toggle { - background: transparent url(images/menu-bits.gif) repeat-x scroll left -108px; -} /* end side admin menu */ /* 2.6 */ -#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins { +#adminmenu a #awaiting-mod, +#sidemenu li a #update-plugins { position: absolute; margin-top: 0.2em; font-size: 0.7em; @@ -1045,7 +997,8 @@ ul#adminmenu li.write-new-button a { width: 1em; } -#adminmenu li a .count-0, #sidemenu li a .count-0 { +#adminmenu li a .count-0, +#sidemenu li a .count-0 { display: none; } @@ -1139,6 +1092,7 @@ html, body { #footer { word-spacing: .3em; font-size: 11px; + margin-top: -45px; } #footer #footer-thankyou, #footer #footer-upgrade { @@ -1278,7 +1232,7 @@ table.form-table td .updated { .form-wrap { margin: 10px 0; - width: 90%; + width: 97%; } .form-wrap p, @@ -1319,8 +1273,12 @@ table.form-table td .updated { } .tagcloud { - width: 90%; - margin: 10px 0 40px; + width: 97%; + margin: 0 0 40px; +} + +.tagcloud h3 { + margin: 2px 0 12px; } #col-left .col-wrap { @@ -1893,10 +1851,6 @@ p.search-box { margin: -5px 0 0; } -#wpbody-content .nosubsub p.search-box { - margin-top: -12px; -} - #wpbody-content .nosubsub h2 { padding-bottom: 0; }