diff --git a/src/wp-admin/css/admin-menu.css b/src/wp-admin/css/admin-menu.css index 789e0f730d..729e432945 100644 --- a/src/wp-admin/css/admin-menu.css +++ b/src/wp-admin/css/admin-menu.css @@ -503,8 +503,7 @@ ul#adminmenu > li.current > a.current:after { } #adminmenu .awaiting-mod, -#adminmenu .update-plugins, -#sidemenu li a span.update-plugins { +#adminmenu .update-plugins { display: inline-block; background-color: #d54e21; color: #fff; @@ -519,8 +518,7 @@ ul#adminmenu > li.current > a.current:after { } #adminmenu li .awaiting-mod span, -#adminmenu li span.update-plugins span, -#sidemenu li a span.update-plugins span { +#adminmenu li span.update-plugins span { display: block; padding: 0 6px; } @@ -531,8 +529,7 @@ ul#adminmenu > li.current > a.current:after { color: #fff; } -#adminmenu li span.count-0, -#sidemenu li a .count-0 { +#adminmenu li span.count-0 { display: none; } diff --git a/src/wp-admin/css/colors/_admin.scss b/src/wp-admin/css/colors/_admin.scss index d83ff231ad..ab550849c2 100644 --- a/src/wp-admin/css/colors/_admin.scss +++ b/src/wp-admin/css/colors/_admin.scss @@ -495,17 +495,6 @@ body.more-filters-opened .more-filters:focus:before { box-shadow: inset 0 1px 0 lighten( $button-color, 15% ), 0 1px 0 rgba(0,0,0,.15); } -/* Thickbox: Plugin information */ - -#sidemenu a.current { - background: $body-background; - border-bottom-color: $body-background; -} - -#plugin-information .action-button { - background: $button-color; -} - /* Responsive Component */ div#wp-responsive-toggle a:before { diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css index 04480bc616..f3ea54ae4f 100644 --- a/src/wp-admin/css/common.css +++ b/src/wp-admin/css/common.css @@ -1352,7 +1352,6 @@ form.upgrade .hint { 6.0 - Admin Header ------------------------------------------------------------------------------*/ #adminmenu a, -#sidemenu a, #taglist a, #catlist a { text-decoration: none; @@ -1920,56 +1919,6 @@ h2 .nav-tab { text-decoration: none; } -#sidemenu { - margin: -30px 15px 0 315px; - list-style: none; - position: relative; - float: right; - padding-left: 10px; - font-size: 12px; -} - -#sidemenu a { - padding: 0 7px; - display: block; - float: left; - line-height: 28px; - border-top: 1px solid #f9f9f9; - border-bottom: 1px solid #dfdfdf; - background-color: #f9f9f9; - -webkit-transition: none; - transition: none; -} - -#sidemenu li { - display: inline; - line-height: 200%; - list-style: none; - text-align: center; - white-space: nowrap; - margin: 0; - padding: 0; -} - -/* @todo: remove border radius */ -#sidemenu a.current { - font-weight: normal; - padding-left: 6px; - padding-right: 6px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; - border: 1px solid #dfdfdf; - border-bottom-color: #f1f1f1; - background-color: #f1f1f1; - color: #000; -} - -#sidemenu li a .count-0 { - display: none; -} - .plugin-install #description, .plugin-install-network #description { width: 60%; diff --git a/src/wp-admin/css/deprecated-media.css b/src/wp-admin/css/deprecated-media.css index 1c5efeaa18..300b2dcc8a 100644 --- a/src/wp-admin/css/deprecated-media.css +++ b/src/wp-admin/css/deprecated-media.css @@ -9,13 +9,50 @@ div#media-upload-header { background: #f9f9f9; } -body#media-upload ul#sidemenu { - font-weight: normal; - margin: 0 5px; +#sidemenu { + overflow: hidden; + float: none; + position: relative; left: 0; bottom: -1px; - float: none; - overflow: hidden; + margin: 0 5px; + padding-left: 10px; + list-style: none; + font-size: 12px; + font-weight: normal; +} + +#sidemenu a { + padding: 0 7px; + display: block; + float: left; + line-height: 28px; + border-top: 1px solid #f9f9f9; + border-bottom: 1px solid #dfdfdf; + background-color: #f9f9f9; + text-decoration: none; + -webkit-transition: none; + transition: none; +} + +#sidemenu li { + display: inline; + line-height: 200%; + list-style: none; + text-align: center; + white-space: nowrap; + margin: 0; + padding: 0; +} + +#sidemenu a.current { + font-weight: normal; + padding-left: 6px; + padding-right: 6px; + border: 1px solid #dfdfdf; + border-bottom-color: #f1f1f1; + background-color: #f1f1f1; + color: #000; } #media-upload:after { /* clearfix */