From e6a11a4232f2f2493f5134882c69e63ea640e764 Mon Sep 17 00:00:00 2001 From: azaozz Date: Sat, 18 Oct 2008 16:54:14 +0000 Subject: [PATCH] Favourites drop-down styling git-svn-id: http://svn.automattic.com/wordpress/trunk@9240 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-header.php | 4 +- wp-admin/css/colors-fresh.css | 6 +- wp-admin/images/fav-arrow.png | Bin 0 -> 322 bytes wp-admin/images/fav-bottom.png | Bin 0 -> 126 bytes wp-admin/images/fav-top.png | Bin 0 -> 160 bytes wp-admin/images/fav.png | Bin 0 -> 214 bytes wp-admin/includes/template.php | 4 +- wp-admin/js/menu.js | 14 +++-- wp-admin/wp-admin.css | 107 +++++++++++++++++++++------------ wp-includes/script-loader.php | 4 +- 10 files changed, 87 insertions(+), 52 deletions(-) create mode 100644 wp-admin/images/fav-arrow.png create mode 100644 wp-admin/images/fav-bottom.png create mode 100644 wp-admin/images/fav-top.png create mode 100644 wp-admin/images/fav.png diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 5ba834ad9..29acb4d3b 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -86,7 +86,6 @@ if ( '' == $blog_name ) -
@@ -100,6 +99,9 @@ if ( '' == $blog_name )

+ + + diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index f28a5c8a8..0e3f93004 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -79,7 +79,7 @@ strong .post-com-count span { #post-body ul#category-tabs li.ui-tabs-selected, .button-secondary, #quicktags, #login form .submit input, .search-box .button, -#ed_reply_toolbar, .favorite-action, #favorite-first { +#ed_reply_toolbar { background-color: #cee1ef !important; } @@ -219,9 +219,7 @@ ul#widget-list li.widget-list-item h4.widget-title { .button-secondary, #login form .submit input, div.dashboard-widget-submit input, -#edit-slug-buttons a.save, -.favorite-action, -#favorite-first { +#edit-slug-buttons a.save { background-color: #e5e5e5; color: #246; border-color: #80b5d0; diff --git a/wp-admin/images/fav-arrow.png b/wp-admin/images/fav-arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..45d6ff35e646844a75ae93d65cfa2169586344f0 GIT binary patch literal 322 zcmV-I0lof-P)Px#2XskIMF-dl5)K^zckA*&0002#Nklp52&5%@-?j~wWsy*luIr#E%E?t#!M1G{f_R=s<2W8_^E{(0 zOX#{TK9jnx59^WVIhYwql8`VY2m51KPHQX`0txr)e52%YrP+psFh3IHt>x zD2gaeQ%utY!!W)FuIn;0-+omS{;fJ|NsAY7iVUWJEauv TEp_N7Py>UftDnm{r-UW|H@qav literal 0 HcmV?d00001 diff --git a/wp-admin/images/fav-top.png b/wp-admin/images/fav-top.png new file mode 100644 index 0000000000000000000000000000000000000000..85a685294a6951e24c9dd1410a4106985ba421c8 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y;0wO~Lq#}WoN`Oy@>%@r@Crp^o*VotE+uPmU z-PzgM*4Eb2($d)2SYKaXQ&Uq}S^0mZ+f$%=b59q?kcv3ghJ}I*0wNCgIdUHOJUGYH z#3&LwX=}V|;MEk*?Q@tfaAkk!lQ_{CHR0HcH79TG`OTOl!_h3*5bX;zg2B_(&t;uc GLK6VqwmBpK literal 0 HcmV?d00001 diff --git a/wp-admin/images/fav.png b/wp-admin/images/fav.png new file mode 100644 index 0000000000000000000000000000000000000000..f3cbe546c54cf5bfc71afb30f810484bfe27200e GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^%s{Nb0U{rqGZF<-t^qzFt`jFtOioVj@9*#J?d|UF z?&#>4FkwPVOG{&8V_jWcZEbB^TU&W~c}Yo0QBhHTetvFlZdO)SMn*'; - echo ''; - echo '
'; + echo '

'; + echo '
'; array_shift($allowed_actions); diff --git a/wp-admin/js/menu.js b/wp-admin/js/menu.js index a69991861..e93ccc5a4 100644 --- a/wp-admin/js/menu.js +++ b/wp-admin/js/menu.js @@ -72,10 +72,12 @@ adminMenu = { } }; -$(document).ready(function(){adminMenu.init();}); -})(jQuery); +$(document).ready(function(){ + adminMenu.init(); -jQuery( function($) { - $('#favorite-actions').bind( 'mouseenter', function(){$('#favorite-action').removeClass('slideUp').addClass('slideDown'); setTimeout(function(){if ( $('#favorite-action').hasClass('slideDown') ) { $('#favorite-action').slideDown('fast') }}, 300) } ); - $('#favorite-actions').bind( 'mouseleave', function(){$('#favorite-action').removeClass('slideDown').addClass('slideUp'); setTimeout(function(){if ( $('#favorite-action').hasClass('slideUp') ) { $('#favorite-action').slideUp('fast') }}, 500) } ); -} ); + $('#favorite-inside').width($('#favorite-first').width()+24); + $('#favorite-toggle, #favorite-inside').bind( 'mouseenter', function(){$('#favorite-inside').removeClass('slideUp').addClass('slideDown'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideDown') ) { $('#favorite-inside').slideDown(100); $('#favorite-first').addClass('slide-down'); }}, 200) } ); + + $('#favorite-toggle, #favorite-inside').bind( 'mouseleave', function(){$('#favorite-inside').removeClass('slideDown').addClass('slideUp'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideUp') ) { $('#favorite-inside').slideUp(100, function(){ $('#favorite-first').removeClass('slide-down'); } ); }}, 300) } ); +}); +})(jQuery); diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 2f5fe2a8c..7ea98a4bc 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -598,12 +598,12 @@ a.view-comment-post-link { /* Admin Header */ #wphead-info { - position: absolute; - right: 15px; - top: 0; + float: right; + margin: 0 15px; } #user_info { + float: right; font-size: 12px; line-height: 46px; height: 46px; @@ -639,8 +639,8 @@ a#view-site-link { } #logo50 { + float: left; margin: 9px 0 0 20px; - position: absolute; } ul#adminmenu li.write-new-button { @@ -664,9 +664,9 @@ ul#adminmenu li.write-new-button a { #wphead h1 { font: normal 22px Georgia, "Times New Roman", Times, serif; - padding: 11px 170px 5px 60px; + padding: 10px 10px 5px; margin: 0; - margin-right: 15%; + float: left; } /* menu stuff */ @@ -2492,49 +2492,82 @@ abbr.required { /* favorite-actions */ #favorite-actions { - position: absolute; - left: -150px; - top: 10px; - width: 130px; - z-index: 10; + float: left; + margin: 11px 12px 0; + min-width: 130px; + position: relative; + } #favorite-first { - -moz-border-radius: 4px; - -khtml-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 12px; + -khtml-border-radius: 12px; + -webkit-border-radius: 12px; + border-radius: 12px; + line-height: 15px; + padding: 3px 30px 4px 12px; + border-color: #464646; border-width: 1px; border-style: solid; - padding: 4px 8px; + background-color: #797979; + background-image: url(images/fav.png); + background-repeat: repeat-x; + background-position: 0 center; +} + +#favorite-inside { + margin: 0 0 0 1px; + padding: 2px 8px 4px; + border-width: 1px; + border-style: solid; + position: absolute; + z-index: 11; + display: none; + -moz-border-radius: 0 0 12px 12px; + -webkit-border-bottom-right-radius: 12px; + -webkit-border-bottom-left-radius: 12px; + -khtml-border-bottom-right-radius: 12px; + -khtml-border-bottom-left-radius: 12px; + border-bottom-right-radius: 12px; + border-bottom-left-radius: 12px; + border-color: #797979; + background-color: #797979; + background-image: url(images/fav-bottom.png); + background-repeat: repeat-x; + background-position: 0 bottom; } .favorite-action { - margin: -3px 0 0; - padding: 4px 8px; - border-width: 1px; - border-top-width: 3px; - border-style: solid; - -moz-border-radius: 0 0 4px 4px; - -webkit-border-bottom-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -khtml-border-bottom-right-radius: 4px; - -khtml-border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; + padding: 3px; } -#favorite-action { - padding: 0; - margin: 0; - display: none; -} #favorite-actions a { - padding: 4px 0; + padding: 4px 5px 4px 0; text-decoration: none; + color: #eee; + font-size: 11px; } -#favorite-first { - padding-right: 22px; - background: url(images/menu-open.png) 108px 5px no-repeat; +#favorite-toggle { + height: 22px; + position: absolute; + right: 0; + top: 1px; + width: 28px; + background: transparent url(images/fav-arrow.png) no-repeat 0 -4px; } + +#favorite-actions .slide-down { + background-image: url(images/fav-top.png); + background-repeat: repeat-x; + background-position: 0 top; + -moz-border-radius: 12px 12px 0 0; + -webkit-border-bottom-right-radius: 0; + -webkit-border-bottom-left-radius: 0; + -khtml-border-bottom-right-radius: 0; + -khtml-border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + border-bottom: 1px solid #626262; +} + diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 2d1eabb74..e2f02df6f 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -278,7 +278,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' ), '20081013' ); + $scripts->add( 'menu', '/wp-admin/js/menu.js', array( 'jquery', 'hoverIntent' ), '20081018' ); } } @@ -310,7 +310,7 @@ function wp_default_styles( &$styles ) { $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie' ); - $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081013' ); + $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081018' ); $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); $styles->add( 'ie', '/wp-admin/css/ie.css' );