From 2cf98e4e006581dd5d7333c1b4a9f8aec6e76a36 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Thu, 5 Dec 2013 18:41:44 +0000
Subject: [PATCH] Themes: Refine how we display the current theme.

props shaunandrews, kwight, matveb.
see #26003.


git-svn-id: https://develop.svn.wordpress.org/trunk@26681 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/wp-admin.css | 55 +++++++++++++----------------------
 src/wp-admin/themes.php       |  8 +++--
 2 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/src/wp-admin/css/wp-admin.css b/src/wp-admin/css/wp-admin.css
index d0d1bb270b..40dc4392be 100644
--- a/src/wp-admin/css/wp-admin.css
+++ b/src/wp-admin/css/wp-admin.css
@@ -6510,37 +6510,26 @@ span.imgedit-scale-warn {
  * The currently active theme
  */
 .theme-browser .theme.active .theme-name {
-	background: #0074a2;
+	background: #2f2f2f;
 	color: #fff;
+	padding-right: 110px;
+	font-weight: 300;
 	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.5);
 	box-shadow:         inset 0 1px 1px rgba(0,0,0,0.5);
 }
 
+.theme-browser .theme.active .theme-name span {
+	font-weight: 600;
+}
+
 .theme-browser .theme.active .theme-actions {
-	top: 0;
-	left: 0;
-	background: #2f2f2f;
-	height: 48px;
+	background: rgba(49,49,49,0.7);
+	border-left: none;
 	opacity: 1;
-	line-height: 48px;
-	padding: 0 10px;
-	z-index: 1;
 }
 
-.theme-browser .theme.active .theme-actions .button {
-	float: right;
-	margin-top: 10px;
-}
-
-.theme-browser .theme.active .current-label {
-	font-size: 13px;
-	font-weight: 400;
-	color: #ccc;
-	margin-left: 5px;
-}
-
-.theme-browser .theme.active .theme-update {
-	top: 48px;
+.theme-browser .theme.active .theme-actions .button-primary {
+	margin-right: 0;
 }
 
 .theme-browser .theme .theme-author {
@@ -7133,11 +7122,6 @@ body.folded .theme-overlay .theme-wrap {
 }
 
 @media only screen and (max-width: 780px) {
-	.theme-browser .theme.active .theme-actions .button {
-		margin-top: 6px;
-		margin-right: -3px
-	}
-
 	body.folded .theme-overlay .theme-wrap,
 	.theme-overlay .theme-wrap {
 		top: 0; /* The adminmenu isn't fixed on mobile, so this can use the full viewport height */
@@ -7150,6 +7134,11 @@ body.folded .theme-overlay .theme-wrap {
 		position: fixed;
 	}
 
+	.theme-browser .theme.active .theme-name span {
+		/* Hide the "Active: " label on smaller screens. */
+		display: none;
+	}
+
 	.theme-overlay .theme-screenshots {
 		width: 40%;
 	}
@@ -7160,6 +7149,10 @@ body.folded .theme-overlay .theme-wrap {
 	.single-theme .theme-wrap {
 		padding: 10px;
 	}
+
+	.theme-browser .theme .theme-actions {
+		padding: 5px 10px 4px 10px;
+	}
 }
 
 @media only screen and (max-width: 480px) {
@@ -7180,14 +7173,6 @@ body.folded .theme-overlay .theme-wrap {
 		margin-left: 0;
 	}
 
-	.theme .theme-actions .button {
-		margin-top: -4px;
-	}
-	.theme.active .theme-actions .button {
-		margin-top: 6px;
-		margin-right: 0;
-	}
-
 	.theme-overlay .theme-actions .delete-theme {
 		position: relative;
 		right: auto;
diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
index 5478b21cdc..bad7c45ef6 100644
--- a/src/wp-admin/themes.php
+++ b/src/wp-admin/themes.php
@@ -221,12 +221,16 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_
 		<div class="theme-screenshot blank"></div>
 	<# } #>
 	<div class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></div>
-	<h3 class="theme-name">{{{ data.name }}}</h3>
+	
+	<# if ( data.active ) { #>
+		<h3 class="theme-name"><span><?php _ex( 'Active:', 'theme' ); ?></span> {{{ data.name }}}</h3>
+	<# } else { #>
+		<h3 class="theme-name">{{{ data.name }}}</h3>
+	<# } #>
 
 	<div class="theme-actions">
 
 	<# if ( data.active ) { #>
-		<span class="current-label"><?php _e( 'Current Theme' ); ?></span>
 		<# if ( data.actions.customize ) { #>
 			<a class="button button-primary hide-if-no-customize" href="{{ data.actions.customize }}"><?php _e( 'Customize' ); ?></a>
 		<# } #>