WordPress.org

Make WordPress Core

Changeset 19270


Ignore:
Timestamp:
11/14/11 11:05:37 (4 years ago)
Author:
koopersmith
Message:

More admin bar markup improvements. Make primary and secondary submenu groups siblings (and prevent ul nesting issues). see #18197.

Location:
trunk/wp-includes
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/class-wp-admin-bar.php

    r19261 r19270  
    192192            <?php 
    193193            if ( $is_parent ) : 
    194                 ?><ul class="ab-submenu"><?php 
    195                 foreach ( $node->children->primary as $child_node ) { 
    196                     $this->recursive_render( $child_node ); 
    197                 } 
    198  
    199                 if ( ! empty( $node->children->secondary ) ): 
    200                     ?><ul class="ab-sub-secondary"><?php 
    201                     foreach ( $node->children->secondary as $child_node ) { 
     194                ?><div class="ab-sub-wrapper"><?php 
     195 
     196                    // Render primary submenu 
     197                    ?><ul class="ab-submenu"><?php 
     198                    foreach ( $node->children->primary as $child_node ) { 
    202199                        $this->recursive_render( $child_node ); 
    203200                    } 
    204201                    ?></ul><?php 
    205                 endif; 
    206                 ?></ul><?php 
     202 
     203                    // Render secondary submenu 
     204                    if ( ! empty( $node->children->secondary ) ): 
     205                        ?><ul class="ab-submenu ab-sub-secondary"><?php 
     206                        foreach ( $node->children->secondary as $child_node ) { 
     207                            $this->recursive_render( $child_node ); 
     208                        } 
     209                        ?></ul><?php 
     210                    endif; 
     211 
     212                ?></div><?php 
    207213            endif; 
    208214 
  • trunk/wp-includes/css/admin-bar.css

    r19261 r19270  
    1 #wpadminbar *{height:auto;width:auto;margin:0;padding:0;position:static;text-transform:none;letter-spacing:normal;line-height:1;font:normal 13px/28px sans-serif;color:#ccc;text-shadow:#444 0 -1px 0;}#wpadminbar ul li:before,#wpadminbar ul li:after{content:normal;}#wpadminbar a,#wpadminbar a:hover,#wpadminbar a img,#wpadminbar a img:hover{outline:none;border:none;text-decoration:none;background:none;}#wpadminbar{direction:ltr;color:#ccc;font:normal 13px/28px sans-serif;height:28px;position:fixed;top:0;left:0;width:100%;z-index:99999;min-width:960px;background-color:#464646;background-image:-ms-linear-gradient(bottom,#373737,#464646 5px);background-image:-moz-linear-gradient(bottom,#373737,#464646 5px);background-image:-o-linear-gradient(bottom,#373737,#464646 5px);background-image:-webkit-gradient(linear,left bottom,left top,from(#373737),to(#464646));background-image:-webkit-linear-gradient(bottom,#373737,#464646 5px);background-image:linear-gradient(bottom,#373737,#464646 5px);}#wpadminbar ul,#wpadminbar ul li{background:none;list-style:none;margin:0;padding:0;position:relative;z-index:99999;}#wpadminbar .quicklinks{border-left:1px solid transparent;}#wpadminbar .quicklinks ul{text-align:left;}#wpadminbar li{float:left;}#wpadminbar .quicklinks>ul>li{border-right:1px solid #555;}#wpadminbar .quicklinks>ul>li>a{border-right:1px solid #333;}#wpadminbar .quicklinks .ab-top-secondary>li{border-left:1px solid #333;border-right:0;float:right;}#wpadminbar .quicklinks .ab-top-secondary>li>a{border-left:1px solid #555;border-right:0;}#wpadminbar .quicklinks a,#wpadminbar .shortlink-input{height:28px;display:block;padding:0 1em;margin:0;}#wpadminbar .quicklinks .menupop ul,#wpadminbar .shortlink-input{margin:0 0 0 -1px;padding-top:6px;padding-bottom:6px;-moz-box-shadow:0 4px 6px rgba(0,0,0,0.2);-webkit-box-shadow:0 4px 6px rgba(0,0,0,0.2);box-shadow:0 4px 6px rgba(0,0,0,0.2);background:#fff;display:none;position:absolute;float:none;border-width:0 1px 1px 1px;border-style:solid;border-color:#dfdfdf;}#wpadminbar .quicklinks .ab-top-secondary .menupop ul{right:0;margin:0 -1px 0 0;}#wpadminbar .selected .shortlink-input{display:block;}#wpadminbar .quicklinks .menupop ul li{float:none;}#wpadminbar .quicklinks .menupop ul li a strong{font-weight:bold;}#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop ul li a strong,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a,#wpadminbar .shortlink-input{line-height:26px;height:26px;color:#21759B;text-shadow:none;white-space:nowrap;min-width:140px;}#wpadminbar .shortlink-input{width:200px;}#wpadminbar.nojs .quicklinks li:hover>ul,#wpadminbar .quicklinks li.hover>ul{display:block;}#wpadminbar .quicklinks .menupop li:hover>ul,#wpadminbar .quicklinks .menupop li.hover>ul{margin-left:100%;margin-top:-33px;border-width:1px;}#wpadminbar .quicklinks .ab-top-secondary .menupop li:hover>ul,#wpadminbar .quicklinks .ab-top-secondary .menupop li.hover>ul{margin-left:0;left:inherit;right:100%;}#wpadminbar .ab-top-menu>li:hover,#wpadminbar .ab-top-menu>li>a:focus{background-color:#3a3a3a;background-image:-ms-linear-gradient(bottom,#3a3a3a,#222);background-image:-moz-linear-gradient(bottom,#3a3a3a,#222);background-image:-o-linear-gradient(bottom,#3a3a3a,#222);background-image:-webkit-gradient(linear,left bottom,left top,from(#3a3a3a),to(#222));background-image:-webkit-linear-gradient(bottom,#3a3a3a,#222);background-image:linear-gradient(bottom,#3a3a3a,#222);}#wpadminbar.nojs .ab-top-menu>li.menupop:hover,#wpadminbar .ab-top-menu li.menupop.hover,#wpadminbar .quicklinks .menupop>a:focus{background:#fff;}#wpadminbar.nojs .quicklinks .menupop:hover a,#wpadminbar .quicklinks .menupop.hover a,#wpadminbar .quicklinks .menupop a:focus{color:#333;text-shadow:none;}#wpadminbar .quicklinks .menupop li:hover,#wpadminbar .quicklinks .menupop li.hover,#wpadminbar .quicklinks .menupop a:focus{background-color:#eaf2fa;}#wpadminbar .ab-top-menu>li>a:hover,#wpadminbar .ab-top-menu>li>a:focus{color:#fafafa;}#wpadminbar .menupop .menupop>a{display:block;background:url(../images/admin-bar-sprite.png?d=11122010) 93% -31px no-repeat;padding-right:2em;}#wpadminbar .ab-top-secondary .menupop .menupop>a{background:url(../images/admin-bar-sprite-rtl.png?d=11122010) 1em -31px no-repeat;padding-left:2em;padding-right:1em;}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary{display:block;position:relative;right:auto;margin:0;border:0;background:#eee;margin:6px 0 -6px;border-top:1px solid #dfdfdf;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;}#wpadminbar .quicklinks .menupop .ab-sub-secondary>li:hover,#wpadminbar .quicklinks .menupop .ab-sub-secondary>li.hover,#wpadminbar .quicklinks .menupop .ab-sub-secondary>li a:focus{background-color:#dfdfdf;}#wpadminbar .quicklinks a span#ab-updates{background:#eee;color:#333;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar .quicklinks a:hover span#ab-updates{background:#fff;color:#000;}#wpadminbar .ab-top-secondary{float:right;}#wpadminbar ul li:last-child,#wpadminbar ul li:last-child a{border-right:0;}#wp-admin-bar-my-account>ul{min-width:270px;}#wpadminbar #wp-admin-bar-my-account .user-info-item{margin-left:88px;margin-right:16px;}#wpadminbar #wp-admin-bar-my-account .user-info-item>a{padding-left:8px;}#wpadminbar #wp-admin-bar-my-account .user-info{margin-top:6px;margin-bottom:15px;height:auto;background:none;}#wp-admin-bar-my-account .user-info .avatar{position:absolute;left:-72px;top:4px;}#wpadminbar #wp-admin-bar-my-account .user-info a{height:auto;}#wpadminbar #wp-admin-bar-my-account .user-info span{background:none;padding:0;height:18px;}#wpadminbar #wp-admin-bar-my-account .user-info .display-name,#wpadminbar #wp-admin-bar-my-account .user-info .username{text-shadow:none;display:block;}#wpadminbar #wp-admin-bar-my-account .user-info .display-name{color:#333;}#wpadminbar #wp-admin-bar-my-account .user-info .username{color:#999;font-size:11px;}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{width:16px;height:16px;border:1px solid #999;padding:0;background:#eee;line-height:24px;vertical-align:middle;margin:-2px 0 0 6px;float:none;}#wpadminbar .quicklinks li img.blavatar{vertical-align:middle;margin:-3px 4px 0 0;padding:0;}#wpadminbar #wp-admin-bar-search a{padding:0;}#wpadminbar .quicklinks .admin-bar-search:hover{background:transparent;}#wpadminbar #adminbarsearch{float:right;height:24px;padding:2px 4px;margin:0;}#wpadminbar #adminbarsearch .adminbar-input{height:23px;width:140px;float:left;font:13px sans-serif;border:none;padding:0 3px 0 24px;margin:0 3px 0 0;color:#ccc;text-shadow:#444 0 -1px 0;background-color:rgba(255,255,255,0);background-image:url('../images/admin-bar-search.png');background-repeat:no-repeat;background-position:4px 2px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;outline:none;-webkit-transition-duration:400ms;-webkit-transition-property:width,background;-webkit-transition-timing-function:ease;-moz-transition-duration:400ms;-moz-transition-property:width,background;-moz-transition-timing-function:ease;-o-transition-duration:400ms;-o-transition-property:width,background;-o-transition-timing-function:ease;}#wpadminbar #adminbarsearch .adminbar-input:focus{color:#555;text-shadow:0 1px 0 #fff;width:200px;background-color:rgba(255,255,255,0.9);}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-button{display:none;}#wpadminbar .wp-admin-bar-logo>a{padding-left:24px;background:url(../images/wp-logo-white.png) no-repeat 13px 6px;}#wpadminbar.nojs .wp-admin-bar-logo:hover>a,#wpadminbar .wp-admin-bar-logo.hover>a,#wpadminbar .quicklinks .wp-admin-bar-logo>a:focus{background:url(../images/wp-logo-dark.png) no-repeat 12px 6px;}#wpadminbar .ab-comments-icon{position:relative;padding-top:5px;float:left;}#wpadminbar .ab-comments-icon-body{margin-top:3px;background:#999;height:10px;width:14px;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar a:hover .ab-comments-icon-body{background:#bbb;color:#555;}#wpadminbar a .ab-comments-icon-arrow{height:0;position:absolute;bottom:-3px;left:3px;border-left:4px solid #999;border-bottom:4px solid transparent;}#wpadminbar a:hover .ab-comments-icon-arrow{border-left-color:#bbb;}#wpadminbar #ab-awaiting-mod{margin-left:4px;}#wpadminbar span.count-0{display:none;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #wpadminbar .menupop a span{background-image:none;} 
     1#wpadminbar *{height:auto;width:auto;margin:0;padding:0;position:static;text-transform:none;letter-spacing:normal;line-height:1;font:normal 13px/28px sans-serif;color:#ccc;text-shadow:#444 0 -1px 0;}#wpadminbar ul li:before,#wpadminbar ul li:after{content:normal;}#wpadminbar a,#wpadminbar a:hover,#wpadminbar a img,#wpadminbar a img:hover{outline:none;border:none;text-decoration:none;background:none;}#wpadminbar{direction:ltr;color:#ccc;font:normal 13px/28px sans-serif;height:28px;position:fixed;top:0;left:0;width:100%;z-index:99999;min-width:960px;background-color:#464646;background-image:-ms-linear-gradient(bottom,#373737,#464646 5px);background-image:-moz-linear-gradient(bottom,#373737,#464646 5px);background-image:-o-linear-gradient(bottom,#373737,#464646 5px);background-image:-webkit-gradient(linear,left bottom,left top,from(#373737),to(#464646));background-image:-webkit-linear-gradient(bottom,#373737,#464646 5px);background-image:linear-gradient(bottom,#373737,#464646 5px);}#wpadminbar .ab-sub-wrapper,#wpadminbar ul,#wpadminbar ul li{background:none;list-style:none;margin:0;padding:0;position:relative;z-index:99999;}#wpadminbar .quicklinks{border-left:1px solid transparent;}#wpadminbar .quicklinks ul{text-align:left;}#wpadminbar li{float:left;}#wpadminbar .quicklinks>ul>li{border-right:1px solid #555;}#wpadminbar .quicklinks>ul>li>a{border-right:1px solid #333;}#wpadminbar .quicklinks .ab-top-secondary>li{border-left:1px solid #333;border-right:0;float:right;}#wpadminbar .quicklinks .ab-top-secondary>li>a{border-left:1px solid #555;border-right:0;}#wpadminbar .quicklinks a,#wpadminbar .shortlink-input{height:28px;display:block;padding:0 1em;margin:0;}#wpadminbar .menupop .ab-sub-wrapper,#wpadminbar .shortlink-input{margin:0 0 0 -1px;padding:0;-moz-box-shadow:0 4px 6px rgba(0,0,0,0.2);-webkit-box-shadow:0 4px 6px rgba(0,0,0,0.2);box-shadow:0 4px 6px rgba(0,0,0,0.2);background:#fff;display:none;position:absolute;float:none;border-width:0 1px 1px 1px;border-style:solid;border-color:#dfdfdf;}#wpadminbar .ab-top-secondary .menupop .ab-sub-wrapper{right:0;margin:0 -1px 0 0;}#wpadminbar .ab-submenu{padding:6px 0;}#wpadminbar .selected .shortlink-input{display:block;}#wpadminbar .quicklinks .menupop ul li{float:none;}#wpadminbar .quicklinks .menupop ul li a strong{font-weight:bold;}#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop ul li a strong,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a,#wpadminbar .shortlink-input{line-height:26px;height:26px;color:#21759B;text-shadow:none;white-space:nowrap;min-width:140px;}#wpadminbar .shortlink-input{width:200px;}#wpadminbar.nojs li:hover>.ab-sub-wrapper,#wpadminbar li.hover>.ab-sub-wrapper{display:block;}#wpadminbar .menupop li:hover>.ab-sub-wrapper,#wpadminbar .menupop li.hover>.ab-sub-wrapper{margin-left:100%;margin-top:-33px;border-width:1px;}#wpadminbar .ab-top-secondary .menupop li:hover>.ab-sub-wrapper,#wpadminbar .ab-top-secondary .menupop li.hover>.ab-sub-wrapper{margin-left:0;left:inherit;right:100%;}#wpadminbar .ab-top-menu>li:hover,#wpadminbar .ab-top-menu>li>a:focus{background-color:#3a3a3a;background-image:-ms-linear-gradient(bottom,#3a3a3a,#222);background-image:-moz-linear-gradient(bottom,#3a3a3a,#222);background-image:-o-linear-gradient(bottom,#3a3a3a,#222);background-image:-webkit-gradient(linear,left bottom,left top,from(#3a3a3a),to(#222));background-image:-webkit-linear-gradient(bottom,#3a3a3a,#222);background-image:linear-gradient(bottom,#3a3a3a,#222);}#wpadminbar.nojs .ab-top-menu>li.menupop:hover,#wpadminbar .ab-top-menu li.menupop.hover,#wpadminbar .quicklinks .menupop>a:focus{background:#fff;}#wpadminbar.nojs .quicklinks .menupop:hover a,#wpadminbar .quicklinks .menupop.hover a,#wpadminbar .quicklinks .menupop a:focus{color:#333;text-shadow:none;}#wpadminbar .quicklinks .menupop li:hover,#wpadminbar .quicklinks .menupop li.hover,#wpadminbar .quicklinks .menupop a:focus{background-color:#eaf2fa;}#wpadminbar .ab-top-menu>li>a:hover,#wpadminbar .ab-top-menu>li>a:focus{color:#fafafa;}#wpadminbar .menupop .menupop>a{display:block;background:url(../images/admin-bar-sprite.png?d=11122010) 93% -31px no-repeat;padding-right:2em;}#wpadminbar .ab-top-secondary .menupop .menupop>a{background:url(../images/admin-bar-sprite-rtl.png?d=11122010) 1em -31px no-repeat;padding-left:2em;padding-right:1em;}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary{display:block;position:relative;right:auto;margin:0;border:0;background:#eee;border-top:1px solid #dfdfdf;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;}#wpadminbar .quicklinks .menupop .ab-sub-secondary>li:hover,#wpadminbar .quicklinks .menupop .ab-sub-secondary>li.hover,#wpadminbar .quicklinks .menupop .ab-sub-secondary>li a:focus{background-color:#dfdfdf;}#wpadminbar .quicklinks a span#ab-updates{background:#eee;color:#333;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar .quicklinks a:hover span#ab-updates{background:#fff;color:#000;}#wpadminbar .ab-top-secondary{float:right;}#wpadminbar ul li:last-child,#wpadminbar ul li:last-child a{border-right:0;}#wp-admin-bar-my-account>ul{min-width:270px;}#wpadminbar #wp-admin-bar-my-account .user-info-item{margin-left:88px;margin-right:16px;}#wpadminbar #wp-admin-bar-my-account .user-info-item>a{padding-left:8px;}#wpadminbar #wp-admin-bar-my-account .user-info{margin-top:6px;margin-bottom:15px;height:auto;background:none;}#wp-admin-bar-my-account .user-info .avatar{position:absolute;left:-72px;top:4px;}#wpadminbar #wp-admin-bar-my-account .user-info a{height:auto;}#wpadminbar #wp-admin-bar-my-account .user-info span{background:none;padding:0;height:18px;}#wpadminbar #wp-admin-bar-my-account .user-info .display-name,#wpadminbar #wp-admin-bar-my-account .user-info .username{text-shadow:none;display:block;}#wpadminbar #wp-admin-bar-my-account .user-info .display-name{color:#333;}#wpadminbar #wp-admin-bar-my-account .user-info .username{color:#999;font-size:11px;}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{width:16px;height:16px;border:1px solid #999;padding:0;background:#eee;line-height:24px;vertical-align:middle;margin:-2px 0 0 6px;float:none;}#wpadminbar .quicklinks li img.blavatar{vertical-align:middle;margin:-3px 4px 0 0;padding:0;}#wpadminbar #wp-admin-bar-search a{padding:0;}#wpadminbar .quicklinks .admin-bar-search:hover{background:transparent;}#wpadminbar #adminbarsearch{float:right;height:24px;padding:2px 4px;margin:0;}#wpadminbar #adminbarsearch .adminbar-input{height:23px;width:140px;float:left;font:13px sans-serif;border:none;padding:0 3px 0 24px;margin:0 3px 0 0;color:#ccc;text-shadow:#444 0 -1px 0;background-color:rgba(255,255,255,0);background-image:url('../images/admin-bar-search.png');background-repeat:no-repeat;background-position:4px 2px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;outline:none;-webkit-transition-duration:400ms;-webkit-transition-property:width,background;-webkit-transition-timing-function:ease;-moz-transition-duration:400ms;-moz-transition-property:width,background;-moz-transition-timing-function:ease;-o-transition-duration:400ms;-o-transition-property:width,background;-o-transition-timing-function:ease;}#wpadminbar #adminbarsearch .adminbar-input:focus{color:#555;text-shadow:0 1px 0 #fff;width:200px;background-color:rgba(255,255,255,0.9);}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-button{display:none;}#wpadminbar .wp-admin-bar-logo>a{padding-left:24px;background:url(../images/wp-logo-white.png) no-repeat 13px 6px;}#wpadminbar.nojs .wp-admin-bar-logo:hover>a,#wpadminbar .wp-admin-bar-logo.hover>a,#wpadminbar .quicklinks .wp-admin-bar-logo>a:focus{background:url(../images/wp-logo-dark.png) no-repeat 12px 6px;}#wpadminbar .ab-comments-icon{position:relative;padding-top:5px;float:left;}#wpadminbar .ab-comments-icon-body{margin-top:3px;background:#999;height:10px;width:14px;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar a:hover .ab-comments-icon-body{background:#bbb;color:#555;}#wpadminbar a .ab-comments-icon-arrow{height:0;position:absolute;bottom:-3px;left:3px;border-left:4px solid #999;border-bottom:4px solid transparent;}#wpadminbar a:hover .ab-comments-icon-arrow{border-left-color:#bbb;}#wpadminbar #ab-awaiting-mod{margin-left:4px;}#wpadminbar span.count-0{display:none;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #wpadminbar .menupop a span{background-image:none;} 
  • trunk/wp-includes/css/admin-bar.dev.css

    r19261 r19270  
    4949} 
    5050 
     51 
     52#wpadminbar .ab-sub-wrapper, 
    5153#wpadminbar ul, 
    5254#wpadminbar ul li { 
     
    98100} 
    99101 
    100 #wpadminbar .quicklinks .menupop ul, 
     102#wpadminbar .menupop .ab-sub-wrapper, 
    101103#wpadminbar .shortlink-input { 
    102104    margin: 0 0 0 -1px; 
    103     padding-top: 6px; 
    104     padding-bottom: 6px; 
     105    padding: 0; 
    105106    -moz-box-shadow: 0 4px 6px rgba(0,0,0,0.2); 
    106107    -webkit-box-shadow: 0 4px 6px rgba(0,0,0,0.2); 
     
    115116} 
    116117 
    117 #wpadminbar .quicklinks .ab-top-secondary .menupop ul { 
     118#wpadminbar .ab-top-secondary .menupop .ab-sub-wrapper { 
    118119    right: 0; 
    119120    margin: 0 -1px 0 0; 
     121} 
     122 
     123#wpadminbar .ab-submenu { 
     124    padding: 6px 0; 
    120125} 
    121126 
     
    149154} 
    150155 
    151 #wpadminbar.nojs .quicklinks li:hover > ul, 
    152 #wpadminbar .quicklinks li.hover > ul { 
    153     display: block; 
    154 } 
    155  
    156 #wpadminbar .quicklinks .menupop li:hover > ul, 
    157 #wpadminbar .quicklinks .menupop li.hover > ul { 
     156#wpadminbar.nojs li:hover > .ab-sub-wrapper, 
     157#wpadminbar li.hover > .ab-sub-wrapper { 
     158    display: block; 
     159} 
     160 
     161#wpadminbar .menupop li:hover > .ab-sub-wrapper, 
     162#wpadminbar .menupop li.hover > .ab-sub-wrapper { 
    158163    margin-left: 100%; 
    159164    margin-top: -33px; 
     
    161166} 
    162167 
    163 #wpadminbar .quicklinks .ab-top-secondary .menupop li:hover > ul, 
    164 #wpadminbar .quicklinks .ab-top-secondary .menupop li.hover > ul { 
     168#wpadminbar .ab-top-secondary .menupop li:hover > .ab-sub-wrapper, 
     169#wpadminbar .ab-top-secondary .menupop li.hover > .ab-sub-wrapper { 
    165170    margin-left: 0; 
    166171    left: inherit; 
     
    223228 
    224229    background: #eee; 
    225     margin: 6px 0 -6px; 
    226230    border-top: 1px solid #dfdfdf; 
    227231 
  • trunk/wp-includes/js/admin-bar.dev.js

    r19207 r19270  
    3434 
    3535            setTimeout(function(){ 
    36                 if ( !t.siblings('ul').find('a:focus').length ) 
     36                if ( !t.siblings('div').find('a:focus').length ) 
    3737                    t.parent().removeClass('hover'); 
    3838            }, 200); 
  • trunk/wp-includes/js/admin-bar.js

    r19207 r19270  
    1 if(typeof(jQuery)!="undefined"){if(typeof(jQuery.fn.hoverIntent)=="undefined"){(function(b){b.fn.hoverIntent=function(p,r){var g={sensitivity:7,interval:100,timeout:0};g=b.extend(g,r?{over:p,out:r}:p);var a,f,t,v;var u=function(c){a=c.pageX;f=c.pageY};var w=function(c,d){d.hoverIntent_t=clearTimeout(d.hoverIntent_t);if((Math.abs(t-a)+Math.abs(v-f))<g.sensitivity){b(d).unbind("mousemove",u);d.hoverIntent_s=1;return g.over.apply(d,[c])}else{t=a;v=f;d.hoverIntent_t=setTimeout(function(){w(c,d)},g.interval)}};var s=function(c,d){d.hoverIntent_t=clearTimeout(d.hoverIntent_t);d.hoverIntent_s=0;return g.out.apply(d,[c])};var x=function(e){var d=this;var c=(e.type=="mouseover"?e.fromElement:e.toElement)||e.relatedTarget;while(c&&c!=this){try{c=c.parentNode}catch(e){c=this}}if(c==this){if(b.browser.mozilla){if(e.type=="mouseout"){d.mtout=setTimeout(function(){q(e,d)},30)}else{if(d.mtout){d.mtout=clearTimeout(d.mtout)}}}return}else{if(d.mtout){d.mtout=clearTimeout(d.mtout)}q(e,d)}};var q=function(e,d){var c=jQuery.extend({},e);if(d.hoverIntent_t){d.hoverIntent_t=clearTimeout(d.hoverIntent_t)}if(e.type=="mouseover"){t=c.pageX;v=c.pageY;b(d).bind("mousemove",u);if(d.hoverIntent_s!=1){d.hoverIntent_t=setTimeout(function(){w(c,d)},g.interval)}}else{b(d).unbind("mousemove",u);if(d.hoverIntent_s==1){d.hoverIntent_t=setTimeout(function(){s(c,d)},g.timeout)}}};return this.mouseover(x).mouseout(x)}})(jQuery)}jQuery(document).ready(function(a){a("#wpadminbar").removeClass("nojq").removeClass("nojs").find("li.menupop").hoverIntent({over:function(b){a(this).addClass("hover")},out:function(b){a(this).removeClass("hover")},timeout:180,sensitivity:7,interval:100});a("#wp-admin-bar-get-shortlink").click(function(b){b.preventDefault();a(this).addClass("selected").children(".shortlink-input").blur(function(){a(this).parents("#wp-admin-bar-get-shortlink").removeClass("selected")}).focus().select()});a(".ab-top-menu > li > a").bind("focus.adminbar",function(){a(this).parent().addClass("hover").find("a").each(function(b,d){var e=a(d),c=e.attr("tabindex");if(c){e.attr("tabindex","0").attr("tabindex",c)}})}).bind("blur.adminbar",function(){var b=a(this);setTimeout(function(){if(!b.siblings("ul").find("a:focus").length){b.parent().removeClass("hover")}},200)});a(".ab-top-menu li ul li a").bind("blur.adminbar",function(){var b=a(this).parents("li.menupop");setTimeout(function(){if(!b.find("a:focus").length){b.removeClass("hover")}},150)})})}else{(function(i,k){var c=function(n,m,d){if(n.addEventListener){n.addEventListener(m,d,false)}else{if(n.attachEvent){n.attachEvent("on"+m,function(){return d.call(n,window.event)})}}},e,f=new RegExp("\\bhover\\b","g"),a=[],j=new RegExp("\\bselected\\b","g"),g=function(m){var d=a.length;while(d--){if(a[d]&&m==a[d][1]){return a[d][0]}}return false},h=function(s){var n,d,q,m,p,r,u=[],o=0;while(s&&s!=e&&s!=i){if("LI"==s.nodeName.toUpperCase()){u[u.length]=s;d=g(s);if(d){clearTimeout(d)}s.className=s.className?(s.className.replace(f,"")+" hover"):"hover";m=s}s=s.parentNode}if(m&&m.parentNode){p=m.parentNode;if(p&&"UL"==p.nodeName.toUpperCase()){n=p.childNodes.length;while(n--){r=p.childNodes[n];if(r!=m){r.className=r.className?r.className.replace(j,""):""}}}}n=a.length;while(n--){q=false;o=u.length;while(o--){if(u[o]==a[n][1]){q=true}}if(!q){a[n][1].className=a[n][1].className?a[n][1].className.replace(f,""):""}}},l=function(d){while(d&&d!=e&&d!=i){if("LI"==d.nodeName.toUpperCase()){(function(m){var n=setTimeout(function(){m.className=m.className?m.className.replace(f,""):""},500);a[a.length]=[n,m]})(d)}d=d.parentNode}},b=function(p){var n,d,o,m=p.target||p.srcElement;while(true){if(!m||m==i||m==e){return}if(m.id&&m.id=="wp-admin-bar-get-shortlink"){break}m=m.parentNode}if(p.preventDefault){p.preventDefault()}p.returnValue=false;if(-1==m.className.indexOf("selected")){m.className+=" selected"}for(n=0,d=m.childNodes.length;n<d;n++){o=m.childNodes[n];if(o.className&&-1!=o.className.indexOf("shortlink-input")){o.focus();o.select();o.onblur=function(){m.className=m.className?m.className.replace(j,""):""};break}}return false};c(k,"load",function(){e=i.getElementById("wpadminbar");if(i.body&&e){i.body.appendChild(e);if(e.className){e.className=e.className.replace(/nojs/,"")}c(e,"mouseover",function(d){h(d.target||d.srcElement)});c(e,"mouseout",function(d){l(d.target||d.srcElement)});c(e,"click",b)}if(k.location.hash){k.scrollBy(0,-32)}})})(document,window)}; 
     1if(typeof(jQuery)!="undefined"){if(typeof(jQuery.fn.hoverIntent)=="undefined"){(function(b){b.fn.hoverIntent=function(p,r){var g={sensitivity:7,interval:100,timeout:0};g=b.extend(g,r?{over:p,out:r}:p);var a,f,t,v;var u=function(c){a=c.pageX;f=c.pageY};var w=function(c,d){d.hoverIntent_t=clearTimeout(d.hoverIntent_t);if((Math.abs(t-a)+Math.abs(v-f))<g.sensitivity){b(d).unbind("mousemove",u);d.hoverIntent_s=1;return g.over.apply(d,[c])}else{t=a;v=f;d.hoverIntent_t=setTimeout(function(){w(c,d)},g.interval)}};var s=function(c,d){d.hoverIntent_t=clearTimeout(d.hoverIntent_t);d.hoverIntent_s=0;return g.out.apply(d,[c])};var x=function(e){var d=this;var c=(e.type=="mouseover"?e.fromElement:e.toElement)||e.relatedTarget;while(c&&c!=this){try{c=c.parentNode}catch(e){c=this}}if(c==this){if(b.browser.mozilla){if(e.type=="mouseout"){d.mtout=setTimeout(function(){q(e,d)},30)}else{if(d.mtout){d.mtout=clearTimeout(d.mtout)}}}return}else{if(d.mtout){d.mtout=clearTimeout(d.mtout)}q(e,d)}};var q=function(e,d){var c=jQuery.extend({},e);if(d.hoverIntent_t){d.hoverIntent_t=clearTimeout(d.hoverIntent_t)}if(e.type=="mouseover"){t=c.pageX;v=c.pageY;b(d).bind("mousemove",u);if(d.hoverIntent_s!=1){d.hoverIntent_t=setTimeout(function(){w(c,d)},g.interval)}}else{b(d).unbind("mousemove",u);if(d.hoverIntent_s==1){d.hoverIntent_t=setTimeout(function(){s(c,d)},g.timeout)}}};return this.mouseover(x).mouseout(x)}})(jQuery)}jQuery(document).ready(function(a){a("#wpadminbar").removeClass("nojq").removeClass("nojs").find("li.menupop").hoverIntent({over:function(b){a(this).addClass("hover")},out:function(b){a(this).removeClass("hover")},timeout:180,sensitivity:7,interval:100});a("#wp-admin-bar-get-shortlink").click(function(b){b.preventDefault();a(this).addClass("selected").children(".shortlink-input").blur(function(){a(this).parents("#wp-admin-bar-get-shortlink").removeClass("selected")}).focus().select()});a(".ab-top-menu > li > a").bind("focus.adminbar",function(){a(this).parent().addClass("hover").find("a").each(function(b,d){var e=a(d),c=e.attr("tabindex");if(c){e.attr("tabindex","0").attr("tabindex",c)}})}).bind("blur.adminbar",function(){var b=a(this);setTimeout(function(){if(!b.siblings("div").find("a:focus").length){b.parent().removeClass("hover")}},200)});a(".ab-top-menu li ul li a").bind("blur.adminbar",function(){var b=a(this).parents("li.menupop");setTimeout(function(){if(!b.find("a:focus").length){b.removeClass("hover")}},150)})})}else{(function(i,k){var c=function(n,m,d){if(n.addEventListener){n.addEventListener(m,d,false)}else{if(n.attachEvent){n.attachEvent("on"+m,function(){return d.call(n,window.event)})}}},e,f=new RegExp("\\bhover\\b","g"),a=[],j=new RegExp("\\bselected\\b","g"),g=function(m){var d=a.length;while(d--){if(a[d]&&m==a[d][1]){return a[d][0]}}return false},h=function(s){var n,d,q,m,p,r,u=[],o=0;while(s&&s!=e&&s!=i){if("LI"==s.nodeName.toUpperCase()){u[u.length]=s;d=g(s);if(d){clearTimeout(d)}s.className=s.className?(s.className.replace(f,"")+" hover"):"hover";m=s}s=s.parentNode}if(m&&m.parentNode){p=m.parentNode;if(p&&"UL"==p.nodeName.toUpperCase()){n=p.childNodes.length;while(n--){r=p.childNodes[n];if(r!=m){r.className=r.className?r.className.replace(j,""):""}}}}n=a.length;while(n--){q=false;o=u.length;while(o--){if(u[o]==a[n][1]){q=true}}if(!q){a[n][1].className=a[n][1].className?a[n][1].className.replace(f,""):""}}},l=function(d){while(d&&d!=e&&d!=i){if("LI"==d.nodeName.toUpperCase()){(function(m){var n=setTimeout(function(){m.className=m.className?m.className.replace(f,""):""},500);a[a.length]=[n,m]})(d)}d=d.parentNode}},b=function(p){var n,d,o,m=p.target||p.srcElement;while(true){if(!m||m==i||m==e){return}if(m.id&&m.id=="wp-admin-bar-get-shortlink"){break}m=m.parentNode}if(p.preventDefault){p.preventDefault()}p.returnValue=false;if(-1==m.className.indexOf("selected")){m.className+=" selected"}for(n=0,d=m.childNodes.length;n<d;n++){o=m.childNodes[n];if(o.className&&-1!=o.className.indexOf("shortlink-input")){o.focus();o.select();o.onblur=function(){m.className=m.className?m.className.replace(j,""):""};break}}return false};c(k,"load",function(){e=i.getElementById("wpadminbar");if(i.body&&e){i.body.appendChild(e);if(e.className){e.className=e.className.replace(/nojs/,"")}c(e,"mouseover",function(d){h(d.target||d.srcElement)});c(e,"mouseout",function(d){l(d.target||d.srcElement)});c(e,"click",b)}if(k.location.hash){k.scrollBy(0,-32)}})})(document,window)}; 
  • trunk/wp-includes/script-loader.php

    r19269 r19270  
    260260    $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20110628', 1 ); 
    261261 
    262     $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20111107', 1 ); 
     262    $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20111114', 1 ); 
    263263 
    264264    $scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wpdialogs' ), '20110929', 1 ); 
     
    454454    $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); 
    455455    $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' ); 
    456     $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20111111' ); 
     456    $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20111114' ); 
    457457    $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array(), '20111107' ); 
    458458    $styles->add( 'editor-buttons', "/wp-includes/css/editor-buttons$suffix.css", array(), '20111107' ); 
Note: See TracChangeset for help on using the changeset viewer.