Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-24 13:54:59 +02:00
Code Issues Projects Releases Wiki Activity

CSS: Move relevant #sidemenu rules into deprecated-media.css and remove the cruft.

Browse Source 
fixes #27956.

Built from https://develop.svn.wordpress.org/trunk@31564


git-svn-id: http://core.svn.wordpress.org/trunk@31545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2015-02-26 23:24:27 +00:00
parent c43fcec0e3
commit 6d03323746
40 changed files with 111 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/css/admin-menu-rtl.css
View File

@ -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;
}

9
wp-admin/css/admin-menu.css
View File

@ -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;
}

11
wp-admin/css/colors/_admin.scss
View File

@ -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 {

8
wp-admin/css/colors/blue/colors-rtl.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f1f1f1;
border-bottom-color: #f1f1f1; }
#plugin-information .action-button {
background: #e1a948; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #e5f8ff; }

2
wp-admin/css/colors/blue/colors-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
wp-admin/css/colors/blue/colors.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #ecc88a, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f1f1f1;
border-bottom-color: #f1f1f1; }
#plugin-information .action-button {
background: #e1a948; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #e5f8ff; }

2
wp-admin/css/colors/blue/colors.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
wp-admin/css/colors/coffee/colors-rtl.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f1f1f1;
border-bottom-color: #f1f1f1; }
#plugin-information .action-button {
background: #c7a589; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #f3f2f1; }

2
wp-admin/css/colors/coffee/colors-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
wp-admin/css/colors/coffee/colors.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #e0cdbd, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f1f1f1;
border-bottom-color: #f1f1f1; }
#plugin-information .action-button {
background: #c7a589; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #f3f2f1; }

2
wp-admin/css/colors/coffee/colors.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
wp-admin/css/colors/ectoplasm/colors-rtl.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f1f1f1;
border-bottom-color: #f1f1f1; }
#plugin-information .action-button {
background: #a3b745; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #ece6f6; }

2
wp-admin/css/colors/ectoplasm/colors-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
wp-admin/css/colors/ectoplasm/colors.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #bfcd7b, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f1f1f1;
border-bottom-color: #f1f1f1; }
#plugin-information .action-button {
background: #a3b745; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #ece6f6; }

2
wp-admin/css/colors/ectoplasm/colors.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
wp-admin/css/colors/light/colors-rtl.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f5f5f5;
border-bottom-color: #f5f5f5; }
#plugin-information .action-button {
background: #04a4cc; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #999; }

2
wp-admin/css/colors/light/colors-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
wp-admin/css/colors/light/colors.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #22cffb, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f5f5f5;
border-bottom-color: #f5f5f5; }
#plugin-information .action-button {
background: #04a4cc; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #999; }

2
wp-admin/css/colors/light/colors.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
wp-admin/css/colors/midnight/colors-rtl.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f1f1f1;
border-bottom-color: #f1f1f1; }
#plugin-information .action-button {
background: #e14d43; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #f1f2f3; }

2
wp-admin/css/colors/midnight/colors-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
wp-admin/css/colors/midnight/colors.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #ec8b85, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f1f1f1;
border-bottom-color: #f1f1f1; }
#plugin-information .action-button {
background: #e14d43; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #f1f2f3; }

2
wp-admin/css/colors/midnight/colors.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
wp-admin/css/colors/ocean/colors-rtl.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f1f1f1;
border-bottom-color: #f1f1f1; }
#plugin-information .action-button {
background: #9ebaa0; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #f2fcff; }

2
wp-admin/css/colors/ocean/colors-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
wp-admin/css/colors/ocean/colors.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #cbdacc, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f1f1f1;
border-bottom-color: #f1f1f1; }
#plugin-information .action-button {
background: #9ebaa0; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #f2fcff; }

2
wp-admin/css/colors/ocean/colors.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
wp-admin/css/colors/sunrise/colors-rtl.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f1f1f1;
border-bottom-color: #f1f1f1; }
#plugin-information .action-button {
background: #dd823b; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #f3f1f1; }

2
wp-admin/css/colors/sunrise/colors-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
wp-admin/css/colors/sunrise/colors.css
View File

@ -318,14 +318,6 @@ body.more-filters-opened .more-filters:hover:before, body.more-filters-opened .m
-webkit-box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 1px 0 #e8ac7c, 0 1px 0 rgba(0, 0, 0, 0.15); }
/* Thickbox: Plugin information */
#sidemenu a.current {
background: #f1f1f1;
border-bottom-color: #f1f1f1; }
#plugin-information .action-button {
background: #dd823b; }
/* Responsive Component */
div#wp-responsive-toggle a:before {
color: #f3f1f1; }

2
wp-admin/css/colors/sunrise/colors.min.css vendored
View File

File diff suppressed because one or more lines are too long

51
wp-admin/css/common-rtl.css
View File

@ -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 315px 0 15px;
list-style: none;
position: relative;
float: left;
padding-right: 10px;
font-size: 12px;
}
#sidemenu a {
padding: 0 7px;
display: block;
float: right;
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-right: 6px;
padding-left: 6px;
-webkit-border-top-right-radius: 3px;
border-top-right-radius: 3px;
-webkit-border-top-left-radius: 3px;
border-top-left-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%;

51
wp-admin/css/common.css
View File

@ -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%;

47
wp-admin/css/deprecated-media-rtl.css
View File

@ -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;
right: 0;
bottom: -1px;
float: none;
overflow: hidden;
margin: 0 5px;
padding-right: 10px;
list-style: none;
font-size: 12px;
font-weight: normal;
}
#sidemenu a {
padding: 0 7px;
display: block;
float: right;
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-right: 6px;
padding-left: 6px;
border: 1px solid #dfdfdf;
border-bottom-color: #f1f1f1;
background-color: #f1f1f1;
color: #000;
}
#media-upload:after { /* clearfix */

2
wp-admin/css/deprecated-media-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

47
wp-admin/css/deprecated-media.css
View File

@ -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 */

2
wp-admin/css/deprecated-media.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
wp-admin/css/wp-admin.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-alpha-31563';
$wp_version = '4.2-alpha-31564';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.