Changeset 26483

Timestamp:

11/30/2013 04:35:12 PM (12 years ago)

Author:

ocean90

Message:

Themes: Prepare wp-admin.css for a merge with theme.css.

• Remove styles for #current-theme and .theme-options. Markup removed in [26141].
• Move "Tabbed Admin Screen Interface" section out of "Themes" section. See [26466].

see #25966.

File:

• trunk/src/wp-admin/css/wp-admin.css (modified) (19 diffs)

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

@@ -33 +33 @@
 15.0 - Comments Screen
 16.0 - Themes
-    16.1 - Custom Header
-    16.2 - Custom Background
-    16.3 - Tabbed Admin Screen Interface
+    16.1 - Manage Themes
+    16.2 - Install Themes
+    16.3 - Custom Header
+    16.4 - Custom Background
 17.0 - Plugins
 18.0 - Users
@@ -44 +45 @@
 23.0 - Full Overlay w/ Sidebar
 24.0 - Customize Loader
-25.0 - Misc
+25.0 - Tabbed Admin Screen Interface
+26.0 - Misc
 
 ------------------------------------------------------------------------*/
@@ -958 +960 @@
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-    -moz-transition: all .1s ease-in-out;
     -webkit-transition: all .1s ease-in-out;
     -moz-transition:    all .1s ease-in-out;
@@ -6278 +6279 @@
 }
 
+
 /*------------------------------------------------------------------------------
   16.0 - Themes
 ------------------------------------------------------------------------------*/
 
+
+/*------------------------------------------------------------------------------
+  16.1 - Manage Themes
+------------------------------------------------------------------------------*/
+
+.broken-themes {
+    clear: both;
+}
+
+.broken-themes table {
+    text-align: left;
+    width: 50%;
+    border-spacing: 3px;
+    padding: 3px;
+}
+
+
+/*------------------------------------------------------------------------------
+  16.2 - Install Themes
+------------------------------------------------------------------------------*/
+
+.theme-install-php h4 {
+    margin: 2.5em 0 8px;
+}
+
 .theme-install-php .tablenav {
     height: auto;
@@ -6288 +6315 @@
 .theme-install-php .spinner {
     margin-top: 9px;
-}
-
-h3.available-themes {
-    margin: 0.3em 0 1em;
-    float: left;
 }
 
@@ -6335 +6357 @@
 }
 
-#current-theme .theme-info li,
-.theme-options li,
 .available-theme .action-links li {
     float: left;
@@ -6354 +6374 @@
 }
 
-#current-theme .theme-info li:last-child,
-.theme-options li:last-child,
 .available-theme .action-links li:last-child {
     padding-right: 0;
@@ -6381 +6399 @@
 .available-theme .action-links p {
     float: left;
-}
-
-#current-theme {
-    margin: 20px 0 10px;
-    padding: 0 0 20px;
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-    overflow: hidden;
-}
-
-#current-theme.has-screenshot {
-    padding-left: 330px;
-}
-
-#current-theme h3 {
-    margin: 0;
-    font-size: 12px;
-    font-weight: normal;
-    color: #999;
-}
-
-#current-theme h4 {
-    margin: 3px 0 16px;
-    font-size: 20px;
-}
-
-#current-theme h4 span {
-    margin-left: 20px;
-    font-size: 12px;
-    font-weight: normal;
-}
-
-#current-theme a {
-    border-bottom: none;
-}
-
-#current-theme .theme-info {
-    margin: 1em 0;
-    overflow: hidden;
-}
-
-#current-theme .theme-description {
-    margin-top: 5px;
-    max-width: 600px;
-    line-height: 1.6em;
-}
-
-#current-theme img {
-    float: left;
-    width: 300px;
-    margin-left: -330px;
-
-    border-width: 1px;
-    border-style: solid;
-}
-
-.theme-options {
-    overflow: hidden;
-    font-size: 14px;
-    padding-bottom: 10px;
-}
-
-.theme-options .load-customize {
-    margin-right: 30px;
-    float: left;
-}
-
-.theme-options span {
-    float: left;
-    margin-right: 10px;
-    text-transform: uppercase;
-    font-size: 11px;
-    line-height: 22px;
-    color: #999;
-}
-
-.theme-options ul {
-    float: left;
-    margin: 0;
 }
 
@@ -6472 +6411 @@
         height: 225px;
     }
-
-    .folded #current-theme img {
-        width: 300px;
-    }
-
-    .folded #current-theme.has-screenshot {
-        padding-left: 330px;
-    }
-
-    .folded #current-theme img {
-        margin-left: -330px;
-    }
 }
 
@@ -6496 +6423 @@
         height: 203px;
     }
-
-    .folded #current-theme img {
-        width: 270px;
-    }
-
-    .folded #current-theme.has-screenshot {
-        padding-left: 300px;
-    }
-
-    .folded #current-theme img {
-        margin-left: -300px;
-    }
 }
 
@@ -6513 +6428 @@
 @media only screen and (max-width: 1200px) {
     .available-theme,
-    .available-theme .screenshot,
-    #current-theme img {
+    .available-theme .screenshot {
         width: 240px;
     }
@@ -6524 +6438 @@
     .available-theme img {
         width: 100%;
-    }
-
-    #current-theme.has-screenshot {
-        padding-left: 270px;
-    }
-
-    #current-theme img {
-        margin-left: -270px;
     }
 }
@@ -6547 +6453 @@
 }
 
-.broken-themes {
-    clear: both;
-}
-
-.broken-themes table {
-    text-align: left;
-    width: 50%;
-    border-spacing: 3px;
-    padding: 3px;
-}
-
-.theme-install-php h4 {
-    margin: 2.5em 0 8px;
-}
-
 
 /*------------------------------------------------------------------------------
-  16.1 - Custom Header Screen
+  16.3 - Custom Header Screen
 ------------------------------------------------------------------------------*/
 
@@ -6599 +6490 @@
 
 /*------------------------------------------------------------------------------
-  16.2 - Custom Background Screen
+  16.4 - Custom Background Screen
 ------------------------------------------------------------------------------*/
 
@@ -6610 +6501 @@
     max-width: 400px;
     max-height: 300px;
-}
-
-
-/*------------------------------------------------------------------------------
-  16.3 - Tabbed Admin Screen Interface (Experimental)
-------------------------------------------------------------------------------*/
-
-.nav-tab {
-    border-style: solid;
-    border-width: 1px 1px 0;
-    font-size: 12px;
-    line-height: 16px;
-    display: inline-block;
-    padding: 4px 14px 6px;
-    text-decoration: none;
-    margin: -4px 4px -1px 0;
-}
-
-.nav-tab-active {
-    border-width: 1px;
-}
-
-.nav-tab-active,
-.nav-tab-active:hover {
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-}
-
-h2.nav-tab-wrapper,
-h3.nav-tab-wrapper {
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-    padding-bottom: 0;
-    padding-left: 10px;
-}
-
-h2 .nav-tab {
-    padding: 6px 10px;
-    font-weight: bold;
-    font-size: 15px;
-    line-height: 24px;
-
 }
 
@@ -7778 +7627 @@
 }
 
+
 /*------------------------------------------------------------------------------
-  25.0 - Misc
+  25.0 - Tabbed Admin Screen Interface (Experimental)
+------------------------------------------------------------------------------*/
+
+.nav-tab {
+    border-style: solid;
+    border-width: 1px 1px 0;
+    font-size: 12px;
+    line-height: 16px;
+    display: inline-block;
+    padding: 4px 14px 6px;
+    text-decoration: none;
+    margin: -4px 4px -1px 0;
+}
+
+.nav-tab-active {
+    border-width: 1px;
+}
+
+.nav-tab-active,
+.nav-tab-active:hover {
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+
+h2.nav-tab-wrapper,
+h3.nav-tab-wrapper {
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    padding-bottom: 0;
+    padding-left: 10px;
+}
+
+h2 .nav-tab {
+    padding: 6px 10px;
+    font-weight: bold;
+    font-size: 15px;
+    line-height: 24px;
+}
+
+
+/*------------------------------------------------------------------------------
+  26.0 - Misc
 ------------------------------------------------------------------------------*/
 
@@ -10016 +9907 @@
 }
 
-#filter-box {
-    clear: both;
-}
-
 .feature-filter {
     padding: 8px 12px 0;
@@ -11850 +11737 @@
         float: none;
         width: 100%;
-        margin-bottom: 15px; 
+        margin-bottom: 15px;
     }
 
@@ -11857 +11744 @@
         width: auto;
         margin-left: 0;
-        margin-bottom: 15px; 
-    }
-
-    /* Theme Management Page */
-    #current-theme.has-screenshot {
-        padding: 0;
-        clear: both;
-    }
-
-    #current-theme img {
-        float: none;
-        margin-left: 0;
         margin-bottom: 15px;
-    }
-
-    #current-theme.has-screenshot img.hide-if-no-customize {
-        display: block;
     }