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

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

wp-admin/css/admin-menu-rtl.css

@@ -503,8 +503,7 @@ ul#adminmenu > li.current > a.current:after {
 }
 
 #adminmenu .awaiting-mod,
-#adminmenu .update-plugins,
+#adminmenu .update-plugins {
-#sidemenu li a span.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,
+#adminmenu li span.update-plugins span {
-#sidemenu li a 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,
+#adminmenu li span.count-0 {
-#sidemenu li a .count-0 {
 	display: none;
 }
 

wp-admin/css/admin-menu.css

@@ -503,8 +503,7 @@ ul#adminmenu > li.current > a.current:after {
 }
 
 #adminmenu .awaiting-mod,
-#adminmenu .update-plugins,
+#adminmenu .update-plugins {
-#sidemenu li a span.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,
+#adminmenu li span.update-plugins span {
-#sidemenu li a 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,
+#adminmenu li span.count-0 {
-#sidemenu li a .count-0 {
 	display: none;
 }
 

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 {

wp-admin/css/colors/blue/colors-rtl.css

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

wp-admin/css/colors/blue/colors.css

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

wp-admin/css/colors/coffee/colors-rtl.css

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

wp-admin/css/colors/coffee/colors.css

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

wp-admin/css/colors/ectoplasm/colors-rtl.css

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

wp-admin/css/colors/ectoplasm/colors.css

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

wp-admin/css/colors/light/colors-rtl.css

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

wp-admin/css/colors/light/colors.css

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

wp-admin/css/colors/midnight/colors-rtl.css

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

wp-admin/css/colors/midnight/colors.css

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

wp-admin/css/colors/ocean/colors-rtl.css

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

wp-admin/css/colors/ocean/colors.css

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

wp-admin/css/colors/sunrise/colors-rtl.css

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

wp-admin/css/colors/sunrise/colors.css

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

wp-admin/css/common-rtl.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 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%;

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

wp-admin/css/deprecated-media-rtl.css

@@ -9,13 +9,50 @@ div#media-upload-header {
 	background: #f9f9f9;
 }
 
-body#media-upload ul#sidemenu {
+#sidemenu {
-	font-weight: normal;
+	overflow: hidden;
-	margin: 0 5px;
+	float: none;
+	position: relative;
 	right: 0;
 	bottom: -1px;
-	float: none;
+	margin: 0 5px;
-	overflow: hidden;
+	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 */

wp-admin/css/deprecated-media.css

@@ -9,13 +9,50 @@ div#media-upload-header {
 	background: #f9f9f9;
 }
 
-body#media-upload ul#sidemenu {
+#sidemenu {
-	font-weight: normal;
+	overflow: hidden;
-	margin: 0 5px;
+	float: none;
+	position: relative;
 	left: 0;
 	bottom: -1px;
-	float: none;
+	margin: 0 5px;
-	overflow: hidden;
+	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 */

wp-includes/version.php

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