<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[26483] trunk/src/wp-admin/css/wp-admin.css: Themes: Prepare wp-admin.css for a merge with theme.css.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26483">26483</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2013-11-30 16:35:12 +0000 (Sat, 30 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Themes: Prepare wp-admin.css for a merge with theme.css.
* Remove styles for `#current-theme` and `.theme-options`. Markup removed in <a href="http://core.trac.wordpress.org/changeset/26141">[26141]</a>.
* Move "Tabbed Admin Screen Interface" section out of "Themes" section. See <a href="http://core.trac.wordpress.org/changeset/26466">[26466]</a>.
see <a href="http://core.trac.wordpress.org/ticket/25966">#25966</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsswpadmincss">trunk/src/wp-admin/css/wp-admin.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/wp-admin.css (26482 => 26483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/wp-admin.css 2013-11-30 15:35:07 UTC (rev 26482)
+++ trunk/src/wp-admin/css/wp-admin.css 2013-11-30 16:35:12 UTC (rev 26483)
</span><span class="lines">@@ -32,9 +32,10 @@
</span><span class="cx"> 14.2 - Image Editor
</span><span class="cx"> 15.0 - Comments Screen
</span><span class="cx"> 16.0 - Themes
</span><del>- 16.1 - Custom Header
- 16.2 - Custom Background
- 16.3 - Tabbed Admin Screen Interface
</del><ins>+ 16.1 - Manage Themes
+ 16.2 - Install Themes
+ 16.3 - Custom Header
+ 16.4 - Custom Background
</ins><span class="cx"> 17.0 - Plugins
</span><span class="cx"> 18.0 - Users
</span><span class="cx"> 19.0 - Tools
</span><span class="lines">@@ -43,7 +44,8 @@
</span><span class="cx"> 22.0 - About Pages
</span><span class="cx"> 23.0 - Full Overlay w/ Sidebar
</span><span class="cx"> 24.0 - Customize Loader
</span><del>-25.0 - Misc
</del><ins>+25.0 - Tabbed Admin Screen Interface
+26.0 - Misc
</ins><span class="cx">
</span><span class="cx"> ------------------------------------------------------------------------*/
</span><span class="cx">
</span><span class="lines">@@ -957,7 +959,6 @@
</span><span class="cx"> display: inline-block;
</span><span class="cx"> -webkit-font-smoothing: antialiased;
</span><span class="cx"> -moz-osx-font-smoothing: grayscale;
</span><del>- -moz-transition: all .1s ease-in-out;
</del><span class="cx"> -webkit-transition: all .1s ease-in-out;
</span><span class="cx"> -moz-transition: all .1s ease-in-out;
</span><span class="cx"> transition: all .1s ease-in-out;
</span><span class="lines">@@ -6277,10 +6278,36 @@
</span><span class="cx"> margin-left: 4px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> /*------------------------------------------------------------------------------
</span><span class="cx"> 16.0 - Themes
</span><span class="cx"> ------------------------------------------------------------------------------*/
</span><span class="cx">
</span><ins>+
+/*------------------------------------------------------------------------------
+ 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;
+}
+
</ins><span class="cx"> .theme-install-php .tablenav {
</span><span class="cx"> height: auto;
</span><span class="cx"> }
</span><span class="lines">@@ -6289,11 +6316,6 @@
</span><span class="cx"> margin-top: 9px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-h3.available-themes {
- margin: 0.3em 0 1em;
- float: left;
-}
-
</del><span class="cx"> .available-theme {
</span><span class="cx"> display: inline-block;
</span><span class="cx"> margin-right: 10px;
</span><span class="lines">@@ -6334,8 +6356,6 @@
</span><span class="cx"> border-color: #777;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#current-theme .theme-info li,
-.theme-options li,
</del><span class="cx"> .available-theme .action-links li {
</span><span class="cx"> float: left;
</span><span class="cx"> padding-right: 10px;
</span><span class="lines">@@ -6353,8 +6373,6 @@
</span><span class="cx"> margin-right: 7px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#current-theme .theme-info li:last-child,
-.theme-options li:last-child,
</del><span class="cx"> .available-theme .action-links li:last-child {
</span><span class="cx"> padding-right: 0;
</span><span class="cx"> margin-right: 0;
</span><span class="lines">@@ -6382,85 +6400,6 @@
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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;
-}
-
</del><span class="cx"> /* Allow for three-up in small windows when sidebar is collapsed */
</span><span class="cx"> @media only screen and (max-width: 1200px) {
</span><span class="cx"> .folded .available-theme,
</span><span class="lines">@@ -6471,18 +6410,6 @@
</span><span class="cx"> .folded .available-theme .screenshot {
</span><span class="cx"> height: 225px;
</span><span class="cx"> }
</span><del>-
- .folded #current-theme img {
- width: 300px;
- }
-
- .folded #current-theme.has-screenshot {
- padding-left: 330px;
- }
-
- .folded #current-theme img {
- margin-left: -330px;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Adjust three-up display in smaller windows when sidebar is collapsed */
</span><span class="lines">@@ -6495,25 +6422,12 @@
</span><span class="cx"> .folded .available-theme .screenshot {
</span><span class="cx"> height: 203px;
</span><span class="cx"> }
</span><del>-
- .folded #current-theme img {
- width: 270px;
- }
-
- .folded #current-theme.has-screenshot {
- padding-left: 300px;
- }
-
- .folded #current-theme img {
- margin-left: -300px;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Allow for three-up on 1024px wide screens, e.g. tablets */
</span><span class="cx"> @media only screen and (max-width: 1200px) {
</span><span class="cx"> .available-theme,
</span><del>- .available-theme .screenshot,
- #current-theme img {
</del><ins>+ .available-theme .screenshot {
</ins><span class="cx"> width: 240px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6524,14 +6438,6 @@
</span><span class="cx"> .available-theme img {
</span><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><del>-
- #current-theme.has-screenshot {
- padding-left: 270px;
- }
-
- #current-theme img {
- margin-left: -270px;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #post-body ul.add-menu-item-tabs li.tabs a,
</span><span class="lines">@@ -6546,24 +6452,9 @@
</span><span class="cx"> color: #cfcfcf;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.broken-themes {
- clear: both;
-}
</del><span class="cx">
</span><del>-.broken-themes table {
- text-align: left;
- width: 50%;
- border-spacing: 3px;
- padding: 3px;
-}
-
-.theme-install-php h4 {
- margin: 2.5em 0 8px;
-}
-
-
</del><span class="cx"> /*------------------------------------------------------------------------------
</span><del>- 16.1 - Custom Header Screen
</del><ins>+ 16.3 - Custom Header Screen
</ins><span class="cx"> ------------------------------------------------------------------------------*/
</span><span class="cx">
</span><span class="cx"> .appearance_page_custom-header #headimg {
</span><span class="lines">@@ -6598,7 +6489,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /*------------------------------------------------------------------------------
</span><del>- 16.2 - Custom Background Screen
</del><ins>+ 16.4 - Custom Background Screen
</ins><span class="cx"> ------------------------------------------------------------------------------*/
</span><span class="cx">
</span><span class="cx"> div#custom-background-image {
</span><span class="lines">@@ -6613,48 +6504,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /*------------------------------------------------------------------------------
</span><del>- 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;
-
-}
-
-
-/*------------------------------------------------------------------------------
</del><span class="cx"> 17.0 - Plugins
</span><span class="cx"> ------------------------------------------------------------------------------*/
</span><span class="cx">
</span><span class="lines">@@ -7777,10 +7626,52 @@
</span><span class="cx"> background-size: 20px 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> /*------------------------------------------------------------------------------
</span><del>- 25.0 - Misc
</del><ins>+ 25.0 - Tabbed Admin Screen Interface (Experimental)
</ins><span class="cx"> ------------------------------------------------------------------------------*/
</span><span class="cx">
</span><ins>+.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
+------------------------------------------------------------------------------*/
+
</ins><span class="cx"> #excerpt,
</span><span class="cx"> .attachmentlinks {
</span><span class="cx"> margin: 0;
</span><span class="lines">@@ -10015,10 +9906,6 @@
</span><span class="cx"> line-height: 180%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#filter-box {
- clear: both;
-}
-
</del><span class="cx"> .feature-filter {
</span><span class="cx"> padding: 8px 12px 0;
</span><span class="cx"> }
</span><span class="lines">@@ -11849,32 +11736,16 @@
</span><span class="cx"> .menu-settings dd {
</span><span class="cx"> float: none;
</span><span class="cx"> width: 100%;
</span><del>- margin-bottom: 15px;
</del><ins>+ margin-bottom: 15px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .menu-settings dt {
</span><span class="cx"> float: none;
</span><span class="cx"> width: auto;
</span><span class="cx"> margin-left: 0;
</span><del>- margin-bottom: 15px;
- }
-
- /* Theme Management Page */
- #current-theme.has-screenshot {
- padding: 0;
- clear: both;
- }
-
- #current-theme img {
- float: none;
- margin-left: 0;
</del><span class="cx"> margin-bottom: 15px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- #current-theme.has-screenshot img.hide-if-no-customize {
- display: block;
- }
-
</del><span class="cx"> .available-theme .action-links .delete-theme {
</span><span class="cx"> float: none;
</span><span class="cx"> margin: 0;
</span></span></pre>
</div>
</div>
</body>
</html>