Changeset 26681

Timestamp:

12/05/2013 06:41:44 PM (11 years ago)

Author:

nacin

Message:

Themes: Refine how we display the current theme.

props shaunandrews, kwight, matveb.
see #26003.

Location:

trunk/src/wp-admin

Files:

• css/wp-admin.css (modified) (5 diffs)
• themes.php (modified) (1 diff)

trunk/src/wp-admin/css/wp-admin.css

@@ -6511 +6511 @@
  */
 .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;
 }
 
@@ -7134 +7123 @@
 
 @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 {
@@ -7151 +7135 @@
     }
 
+    .theme-browser .theme.active .theme-name span {
+        /* Hide the "Active: " label on smaller screens. */
+        display: none;
+    }
+
     .theme-overlay .theme-screenshots {
         width: 40%;
@@ -7160 +7149 @@
     .single-theme .theme-wrap {
         padding: 10px;
+    }
+
+    .theme-browser .theme .theme-actions {
+        padding: 5px 10px 4px 10px;
     }
 }
@@ -7179 +7172 @@
     .theme-overlay .theme-description {
         margin-left: 0;
-    }
-
-    .theme .theme-actions .button {
-        margin-top: -4px;
-    }
-    .theme.active .theme-actions .button {
-        margin-top: 6px;
-        margin-right: 0;
     }
 

trunk/src/wp-admin/themes.php

@@ -222 +222 @@
     <# } #>
     <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>