<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16136] trunk/wp-admin/css/wp-admin.dev.css: First pass of wp-admin.
css cleanup from JohnONolan.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16136">16136</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-11-01 16:30:27 +0000 (Mon, 01 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass of wp-admin.css cleanup from JohnONolan.
Merge conflicts manually resolved and marked for review
Not recompressed for now to allow for easier side by side testing.
So test with SCRIPT_DEBUG set to true.
See <a href="http://trac.wordpress.org/ticket/14770">#14770</a> props JohnONolan</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (16135 => 16136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2010-11-01 16:28:35 UTC (rev 16135)
+++ trunk/wp-admin/css/wp-admin.dev.css 2010-11-01 16:30:27 UTC (rev 16136)
</span><span class="lines">@@ -1,19 +1,70 @@
</span><del>-textarea,
-input[type="text"],
-input[type="password"],
-input[type="file"],
-input[type="button"],
-input[type="submit"],
-input[type="reset"],
-select {
- border-width: 1px;
- border-style: solid;
- -moz-border-radius: 4px;
- -khtml-border-radius: 4px;
- -webkit-border-radius: 4px;
- border-radius: 4px;
-}
</del><ins>+/*------------------------------------------------------------------------------
</ins><span class="cx">
</span><ins>+
+Hello, this is the main WordPress admin CSS file.
+All the important stuff is in here.
+
+
+IMPORTANT:
+----------
+Please be careful when editing this file, do not just add
+another ID or Class because it's easy, we want to try and
+maintain the WordPress CSS with good styles, not easy ones!
+
+Before editing or adding to this file, please review the table
+of contents and ensure that you add new styles in the correct
+location. This makes it easier to maintain going forwards.
+
+Be obvious, not clever. Styles which can be easily changed
+are far more desirable than a complex cascading masterpiece.
+
+
+TABLE OF CONTENTS:
+------------------
+ 1.0 - Text Elements
+ 2.0 - Forms
+ 3.0 - Actions
+ 4.0 - Notifications
+ 5.0 - TinyMCE
+ 6.0 - Admin Header
+ 6.1 - Favorites Menu
+ 6.2 - Screen Options Tabs
+ 7.0 - Main Navigation
+ 8.0 - Layout Blocks
+ 9.0 - Dashboard
+10.0 - List Posts
+ 10.1 - Inline Editing
+11.0 - Write/Edit Post Screen
+ 11.1 - Custom Fields
+ 11.2 - Post Revisions
+12.0 - Categories
+13.0 - Tags
+14.0 - Media Screen
+ 14.1 - Media Uploader
+ 14.2 - Image Editor
+15.0 - Comments Screen
+16.0 - Themes
+ 16.1 - Custom Header
+ 16.2 - Custom Background
+ 16.3 - Tabbed Admin Screen Interface
+17.0 - Plugins
+18.0 - Users
+19.0 - Tools
+20.0 - Settings
+21.0 - Admin Footer
+22.0 - Misc
+23.0 - Dead
+
+
+------------------------------------------------------------------------------*/
+
+
+
+
+/*------------------------------------------------------------------------------
+ 1.0 - Text Styles
+------------------------------------------------------------------------------*/
+
</ins><span class="cx"> p,
</span><span class="cx"> ul,
</span><span class="cx"> ol,
</span><span class="lines">@@ -23,272 +74,263 @@
</span><span class="cx"> font-size: 12px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-select option {
- padding: 2px;
</del><ins>+ol {
+ list-style-type: decimal;
+ margin-left: 2em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugins #name {width: 33%}
-
-.plugins .name,
-#pass-strength-result.strong,
-#pass-strength-result.short,
-.button-highlighted,
-input.button-highlighted,
-#quicktags #ed_strong,
-#ed_reply_toolbar #ed_reply_strong {
- font-weight: bold;
</del><ins>+.code, code {
+ font-family: Consolas, Monaco, Courier, monospace;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugins p {
- margin: 0 4px;
- padding: 0;
</del><ins>+kbd, code {
+ padding: 1px 3px;
+ margin: 0 1px;
+ font-size: 11px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugins .desc p {
- margin: 0 0 8px;
</del><ins>+.quicktags, .search {
+ font: 12px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugins td.desc {
- line-height: 1.5em;
</del><ins>+.icon32 {
+ float: left;
+ height: 36px;
+ margin: 14px 6px 0 0;
+ width: 36px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugins .desc ul,
-.plugins .desc ol {
- margin: 0 0 0 2em;
</del><ins>+.key-labels label {
+ line-height: 24px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugins .desc ul {
- list-style-type: disc;
</del><ins>+.subtitle {
+ font-size: 0.75em;
+ line-height: 1;
+ padding-left: 25px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugins .action-links {
- white-space: nowrap;
</del><ins>+.pre {
+ /* http://www.longren.org/2006/09/27/wrapping-text-inside-pre-tags/ */
+ white-space: pre-wrap; /* css-3 */
+ white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
+ white-space: -pre-wrap; /* Opera 4-6 */
+ white-space: -o-pre-wrap; /* Opera 7 */
+ word-wrap: break-word; /* Internet Explorer 5.5+ */
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugins .row-actions-visible {
- padding: 0;
</del><ins>+.howto {
+ font-style: italic;
+ display: block;
+ font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugins tbody th.check-column {
- padding: 7px 0;
</del><ins>+p.install-help {
+ margin: 8px 0;
+ font-style: italic;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugins td, .plugins th {
- border-bottom: 0 none;
-}
</del><span class="cx">
</span><del>-#install-plugins .plugins td,
-#install-plugins .plugins th {
- border-bottom-style: solid;
- border-bottom-width: 1px;
-}
</del><ins>+/*------------------------------------------------------------------------------
+ 2.0 - Forms
+------------------------------------------------------------------------------*/
</ins><span class="cx">
</span><del>-.plugins .inactive td,
-.plugins .inactive th,
-.plugins .active td,
-.plugins .active th {
- border-top-style: solid;
- border-top-width: 1px;
- padding: 5px 7px 0;
</del><ins>+textarea,
+input[type="text"],
+input[type="password"],
+input[type="file"],
+input[type="button"],
+input[type="submit"],
+input[type="reset"],
+select {
+ border-width: 1px;
+ border-style: solid;
+ -moz-border-radius: 4px;
+ -khtml-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border-radius: 4px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .plugins .plugin-title {
- padding-right: 12px;
</del><ins>+select option {
+ padding: 2px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugins .second td,
-.plugins .second th {
- border-top: 0 none;
- padding: 0 7px 5px;
</del><ins>+.submit {
+ padding: 1.5em 0;
+ margin: 5px 0;
+ -moz-border-radius: 0 0 3px 3px;
+ -webkit-border-bottom-left-radius: 3px;
+ -webkit-border-bottom-right-radius: 3px;
+ -khtml-border-bottom-left-radius: 3px;
+ -khtml-border-bottom-right-radius: 3px;
+ border-bottom-left-radius: 3px;
+ border-bottom-right-radius: 3px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugins-php .widefat tfoot th,
-.plugins-php .widefat tfoot td {
- border-top-style: solid;
- border-top-width: 1px;
</del><ins>+form p.submit a.cancel:hover {
+ text-decoration: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.import-system {
- font-size: 16px;
</del><ins>+.submit input,
+.button,
+input.button,
+.button-primary,
+input.button-primary,
+.button-secondary,
+input.button-secondary,
+.button-highlighted,
+input.button-highlighted,
+#postcustomstuff .submit input {
+ text-decoration: none;
+ font-size: 11px !important;
+ line-height: 13px;
+ padding: 3px 8px;
+ cursor: pointer;
+ border-width: 1px;
+ border-style: solid;
+ -moz-border-radius: 11px;
+ -khtml-border-radius: 11px;
+ -webkit-border-radius: 11px;
+ border-radius: 11px;
+ -moz-box-sizing: content-box;
+ -webkit-box-sizing: content-box;
+ -khtml-box-sizing: content-box;
+ box-sizing: content-box;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.anchors {
- margin: 10px 20px 10px 20px;
</del><ins>+#minor-publishing-actions input,
+#major-publishing-actions input,
+#minor-publishing-actions .preview {
+ min-width: 80px;
+ text-align: center;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#loading-items {
- position: absolute;
- z-index: 9999;
- padding: 10px;
- background-color: #fff;
- font-weight: bold;
- text-align: center;
- opacity: 0.5;
</del><ins>+textarea.all-options, input.all-options {
+ width: 250px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-table#availablethemes {
- border-spacing: 0;
- border-width: 1px 0;
- border-style: solid none;
- margin: 10px auto;
- width: 100%;
</del><ins>+input.large-text,
+textarea.large-text {
+ width: 99%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-td.available-theme {
- vertical-align: top;
- width: 240px;
- margin: 0;
- padding: 20px;
- text-align: left;
</del><ins>+input.regular-text,
+#adduser .form-field input {
+ width: 25em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-table#availablethemes td {
- border-width: 0 1px 1px;
- border-style: none solid solid;
</del><ins>+input.small-text {
+ width: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-table#availablethemes td.right,
-table#availablethemes td.left {
- border-right: 0 none;
- border-left: 0 none;
</del><ins>+#doaction,
+#doaction2,
+#post-query-submit {
+ margin-right: 8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-table#availablethemes td.bottom {
- border-bottom: 0 none;
</del><ins>+.tablenav select[name="action"],
+.tablenav select[name="action2"] {
+ width: 130px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.available-theme a.screenshot {
- width: 240px;
- height: 180px;
- display: block;
- border-width: 1px;
- border-style: solid;
- margin-bottom: 10px;
- overflow: hidden;
</del><ins>+.tablenav select[name="m"] {
+ width: 155px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.available-theme img {
- width: 240px;
</del><ins>+.tablenav select#cat {
+ width: 170px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.available-theme h3 {
- margin: 15px 0 5px;
</del><ins>+#wpcontent select {
+ padding: 2px;
+ height: 2em;
+ font-size: 11px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#current-theme {
- margin: 1em 0 1.5em;
</del><ins>+#wpcontent option {
+ padding: 2px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#current-theme a {
- border-bottom: none;
</del><ins>+#timezone_string option {
+ margin-left: 1em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#current-theme h3 {
- font-size: 17px;
- font-weight: normal;
- margin: 0;
</del><ins>+label,
+#your-profile label + a {
+ vertical-align: middle;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#current-theme .theme-description {
- margin-top: 5px;
</del><ins>+#misc-publishing-actions label {
+ vertical-align: baseline;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#current-theme img {
</del><ins>+#pass-strength-result {
+ border-style: solid;
+ border-width: 1px;
</ins><span class="cx"> float: left;
</span><del>- border-width: 1px;
- border-style: solid;
- margin-right: 1em;
- margin-bottom: 1.5em;
- width: 150px;
</del><ins>+ margin: 12px 5px 5px 1px;
+ padding: 3px 5px;
+ text-align: center;
+ width: 200px;
+ display: none;
</ins><span class="cx"> }
</span><del>-
-.theme-options span {
- text-transform: uppercase;
- font-size: 13px;
</del><ins>+.indicator-hint {
+ padding-top: 8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.theme-options a {
- font-size: 15px;
</del><ins>+p.search-box {
+ float: right;
+ margin: -5px 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#TB_window #TB_title a.tb-theme-preview-link,
-#TB_window #TB_title a.tb-theme-preview-link:visited {
- font-weight: bold;
- text-decoration: none;
-}
</del><span class="cx">
</span><del>-#TB_window #TB_title {
- background-color: #222;
- color: #cfcfcf;
-}
</del><ins>+/*------------------------------------------------------------------------------
+ 3.0 - Actions
+------------------------------------------------------------------------------*/
</ins><span class="cx">
</span><del>-.checkbox {
- border: none;
- margin: 0;
- padding: 0;
</del><ins>+#major-publishing-actions {
+ padding: 6px;
+ clear: both;
+ border-top: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.code, code {
- font-family: Consolas, Monaco, Courier, monospace;
-}
</del><span class="cx">
</span><del>-kbd, code {
- padding: 1px 3px;
- margin: 0 1px;
- font-size: 11px;
-}
</del><span class="cx">
</span><del>-.commentlist li {
- padding: 1em 1em .2em;
- margin: 0;
- border-bottom-width: 1px;
- border-bottom-style: solid;
</del><ins>+#delete-action {
+ line-height: 25px;
+ vertical-align: middle;
+ text-align: left;
+ float: left;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.commentlist li li {
- border-bottom: 0;
- padding: 0;
</del><ins>+#publishing-action {
+ text-align: right;
+ float: right;
+ line-height: 23px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.commentlist p {
- padding: 0;
- margin: 0 0 .8em;
</del><ins>+#post-body #minor-publishing {
+ padding-bottom: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.post-categories {
- display: inline;
- margin: 0;
</del><ins>+#post-body #misc-publishing-actions {
</ins><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.post-categories li {
- display: inline;
</del><ins>+#post-body .misc-pub-section {
+ border-right-width: 1px;
+ border-right-style: solid;
+ border-bottom: 0 none;
+ min-height: 30px;
+ float: left;
+ max-width: 32%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.quicktags, .search {
- font: 12px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
</del><ins>+#post-body .misc-pub-section-last {
+ border-right: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.submit {
- padding: 1.5em 0;
- margin: 5px 0;
- -moz-border-radius: 0 0 3px 3px;
- -webkit-border-bottom-left-radius: 3px;
- -webkit-border-bottom-right-radius: 3px;
- -khtml-border-bottom-left-radius: 3px;
- -khtml-border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px;
- border-bottom-right-radius: 3px;
-}
-
-form p.submit a.cancel:hover {
- text-decoration: none;
-}
-
-#submitdiv h3 {
- margin-bottom: 0 !important;
-}
-
</del><span class="cx"> #misc-publishing-actions {
</span><span class="cx"> padding: 6px 0 16px 0;
</span><span class="cx"> }
</span><span class="lines">@@ -326,53 +368,8 @@
</span><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#major-publishing-actions {
- padding: 6px;
- clear: both;
- border-top: none;
-}
</del><span class="cx">
</span><del>-#minor-publishing-actions input,
-#major-publishing-actions input,
-#minor-publishing-actions .preview {
- min-width: 80px;
- text-align: center;
-}
</del><span class="cx">
</span><del>-#delete-action {
- line-height: 25px;
- vertical-align: middle;
- text-align: left;
- float: left;
-}
-
-#publishing-action {
- text-align: right;
- float: right;
- line-height: 23px;
-}
-
-#post-body #minor-publishing {
- padding-bottom: 10px;
-}
-
-#post-body #misc-publishing-actions {
- padding: 0;
-}
-
-#post-body .misc-pub-section {
- border-right-width: 1px;
- border-right-style: solid;
- border-bottom: 0 none;
- min-height: 30px;
- float: left;
- max-width: 32%;
-}
-
-#post-body .misc-pub-section-last {
- border-right: 0;
-}
-
</del><span class="cx"> #sticky-span {
</span><span class="cx"> margin-left: 18px;
</span><span class="cx"> }
</span><span class="lines">@@ -402,33 +399,6 @@
</span><span class="cx"> list-style: square;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.submit input,
-.button,
-input.button,
-.button-primary,
-input.button-primary,
-.button-secondary,
-input.button-secondary,
-.button-highlighted,
-input.button-highlighted,
-#postcustomstuff .submit input {
- text-decoration: none;
- font-size: 11px !important;
- line-height: 13px;
- padding: 3px 8px;
- cursor: pointer;
- border-width: 1px;
- border-style: solid;
- -moz-border-radius: 11px;
- -khtml-border-radius: 11px;
- -webkit-border-radius: 11px;
- border-radius: 11px;
- -moz-box-sizing: content-box;
- -webkit-box-sizing: content-box;
- -khtml-box-sizing: content-box;
- box-sizing: content-box;
-}
-
</del><span class="cx"> a.button,
</span><span class="cx"> a.button-primary,
</span><span class="cx"> a.button-secondary {
</span><span class="lines">@@ -438,39 +408,6 @@
</span><span class="cx"> -webkit-border-radius: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#doaction,
-#doaction2,
-#post-query-submit {
- margin-right: 8px;
-}
-
-.tablenav select[name="action"],
-.tablenav select[name="action2"] {
- width: 130px;
-}
-
-.tablenav select[name="m"] {
- width: 155px;
-}
-
-.tablenav select#cat {
- width: 170px;
-}
-
-#wpcontent select {
- padding: 2px;
- height: 2em;
- font-size: 11px;
-}
-
-#wpcontent option {
- padding: 2px;
-}
-
-#timezone_string option {
- margin-left: 1em;
-}
-
</del><span class="cx"> .approve {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="lines">@@ -485,45 +422,82 @@
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.narrow {
- width: 70%;
- margin-bottom: 40px;
</del><ins>+.add-new-h2 {
+ font-style: normal;
+ margin: 0 6px;
+ position: relative;
+ top: -3px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.narrow p {
- line-height: 150%;
</del><ins>+td.action-links,
+th.action-links {
+ text-align: right;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-textarea.all-options, input.all-options {
- width: 250px;
</del><ins>+.describe .del-link {
+ padding-left: 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#namediv table {
- width: 100%;
</del><ins>+
+/*------------------------------------------------------------------------------
+ 4.0 - Notifications
+------------------------------------------------------------------------------*/
+
+#update-nag, .update-nag {
+ line-height: 19px;
+ padding: 5px 0;
+ font-size: 12px;
+ text-align: center;
+ margin: 0 15px;
+ border-width: 1px;
+ border-style: solid;
+ border-top-width: 0;
+ border-top-style: none;
+ -moz-border-radius: 0 0 6px 6px;
+ -webkit-border-bottom-right-radius: 6px;
+ -webkit-border-bottom-left-radius: 6px;
+ -khtml-border-bottom-right-radius: 6px;
+ -khtml-border-bottom-left-radius: 6px;
+ border-bottom-right-radius: 6px;
+ border-bottom-left-radius: 6px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#namediv td.first {
- width: 10px;
- white-space: nowrap;
</del><ins>+.plugins .plugin-update {
+ padding: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#namediv input {
- width: 98%;
</del><ins>+.plugin-update .update-message {
+ margin: 0 10px 8px 31px;
+ font-weight: bold;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#namediv p {
- margin: 10px 0;
</del><ins>+ul#dismissed-updates {
+ display: none;
</ins><span class="cx"> }
</span><ins>+form.upgrade {
+ margin-top: 8px;
+}
</ins><span class="cx">
</span><del>-#wpbody-content .metabox-holder {
- padding-top: 10px;
</del><ins>+form.upgrade .hint {
+ font-style: italic;
+ font-size: 85%;
+ margin: -0.5em 0 2em 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#content {
- margin: 0;
- width: 100%;
</del><ins>+.ajax-feedback {
+ visibility: hidden;
+ vertical-align: bottom;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#ajax-response.alignleft {
+ margin-left: 2em;
+}
+
+
+/*------------------------------------------------------------------------------
+ 5.0 - TinyMCE
+------------------------------------------------------------------------------*/
+
</ins><span class="cx"> #editorcontainer #content {
</span><span class="cx"> padding: 6px;
</span><span class="cx"> line-height: 150%;
</span><span class="lines">@@ -592,16 +566,20 @@
</span><span class="cx"> font-style: italic;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#excerpt, .attachmentlinks {
- margin: 0;
- height: 4em;
- width: 98%;
</del><ins>+#wp_editbtns,
+#wp_gallerybtns {
+ padding: 2px;
+ position: absolute;
+ display: none;
+ z-index: 999998;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* post meta postbox */
-#postcustomstuff table,
-#postcustomstuff input,
-#postcustomstuff textarea {
</del><ins>+#wp_editimgbtn,
+#wp_delimgbtn,
+#wp_editgallery,
+#wp_delgallery {
+ margin: 2px;
+ padding: 2px;
</ins><span class="cx"> border-width: 1px;
</span><span class="cx"> border-style: solid;
</span><span class="cx"> -moz-border-radius: 3px;
</span><span class="lines">@@ -610,348 +588,237 @@
</span><span class="cx"> border-radius: 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#postcustomstuff .updatemeta,
-#postcustomstuff .deletemeta {
- margin: auto;
-}
</del><span class="cx">
</span><del>-#postcustomstuff thead th {
- padding: 5px 8px 8px;
</del><ins>+/*------------------------------------------------------------------------------
+ 6.0 - Admin Header
+------------------------------------------------------------------------------*/
+#wphead-info {
+ margin: 0 0 0 15px;
+ padding-right: 15px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#postcustom #postcustomstuff .submit {
- border: 0 none;
- float: none;
- padding: 5px 8px;
</del><ins>+#user_info {
+ float: right;
+ font-size: 12px;
+ line-height: 46px;
+ height: 46px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#side-sortables #postcustom #postcustomstuff .submit {
- padding: 0 5px;
-}
-
-#side-sortables #postcustom #postcustomstuff td.left input {
- margin: 3px 3px 0;
-}
-
-#side-sortables #postcustom #postcustomstuff #the-list textarea {
- height: 85px;
- margin: 3px;
-}
-
-#postcustomstuff table {
</del><ins>+#user_info p {
</ins><span class="cx"> margin: 0;
</span><del>- width: 100%;
- border-width: 1px;
- border-style: solid;
- border-spacing: 0;
</del><ins>+ padding: 0;
+ line-height: 46px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#postcustomstuff table input,
-#postcustomstuff table select,
-#postcustomstuff table textarea {
- width: 95%;
- margin: 8px 0 8px 8px;
</del><ins>+#wphead {
+ height: 46px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#postcustomstuff th.left,
-#postcustomstuff td.left {
- width: 38%;
-}
-
-#postcustomstuff .submit input {
- width: auto;
-}
-
-#postcustomstuff #newmeta .submit {
- padding: 0 8px;
-}
-
-#postcustomstuff table #addmetasub {
- width: auto;
-}
-
-#postcustomstuff #newmetaleft {
- vertical-align: top;
-}
-
-#postcustomstuff #newmetaleft a {
- padding: 0 10px;
</del><ins>+#wphead a,
+#adminmenu a,
+#sidemenu a,
+#taglist a,
+#catlist a,
+#show-settings a {
</ins><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#save {
- width: 15em;
</del><ins>+#header-logo {
+ float: left;
+ margin: 7px 0 0 15px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#template div {
- margin-right: 190px;
-}
-
-* html #template div {
- margin-right: 0;
-}
-
-/* A handy div class for hiding controls.
-Some browsers will disable them when you
-set display: none; */
-.zerosize {
- height: 0;
- width: 0;
</del><ins>+#wphead h1 {
+ font: normal 22px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+ padding: 10px 8px 5px;
</ins><span class="cx"> margin: 0;
</span><del>- border: 0;
- padding: 0;
- overflow: hidden;
- position: absolute;
</del><ins>+ float: left;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-* html #themeselect {
- padding: 0 3px;
- height: 22px;
</del><ins>+#wphead h1.long-title {
+ font: normal 18px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+ padding: 12px 10px 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#your-profile legend {
- font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
- font-size: 22px;
</del><ins>+#wphead #privacy-on-link {
+ font-size: 50%;
+ font-style: normal;
+ line-height: 17px;
+ padding: 0 6px;
+ vertical-align: middle;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#your-profile #rich_editing {
- border: none;
</del><ins>+#wphead h1 a:hover {
+ text-decoration:none;
</ins><span class="cx"> }
</span><del>-
-#howto {
- font-size: 11px;
- margin: 0 5px;
- display: block;
</del><ins>+#wphead h1 a:hover #site-title,
+#wphead h1 a#privacy-on-link:hover {
+ text-decoration:underline;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#ajax-response.alignleft {
- margin-left: 2em;
-}
</del><span class="cx">
</span><del>-div.nav {
- height: 2em;
- padding: 7px 10px;
- vertical-align: text-top;
- margin: 5px 0;
-}
</del><ins>+/*------------------------------------------------------------------------------
+ 6.1 - Favorites Menu
+------------------------------------------------------------------------------*/
</ins><span class="cx">
</span><del>-.nav .button-secondary {
- padding: 2px 4px;
</del><ins>+#favorite-actions {
+ float: right;
+ margin: 11px 12px 0;
+ min-width: 130px;
+ position: relative;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.tablenav-pages a {
- border-bottom-style: solid;
- border-bottom-width: 2px;
- font-weight: bold;
- margin-right: 1px;
- padding: 0 2px;
</del><ins>+#favorite-first {
+ -moz-border-radius: 12px;
+ -khtml-border-radius: 12px;
+ -webkit-border-radius: 12px;
+ border-radius: 12px;
+ line-height: 15px;
+ padding: 3px 30px 4px 12px;
+ border-width: 1px;
+ border-style: solid;
</ins><span class="cx"> }
</span><del>-.tablenav-pages .current-page {
- text-align: center;
-}
-.tablenav-pages .next-page {
- margin-left: 2px;
-}
</del><span class="cx">
</span><del>-p.pagenav {
- margin: 0;
- display: inline;
</del><ins>+#favorite-inside {
+ margin: 0 0 0 0px;
+ padding: 2px 1px;
+ border-width: 1px;
+ border-style: solid;
+ position: absolute;
+ z-index: 11;
+ display: none;
+ -moz-border-radius: 0 0 12px 12px;
+ -webkit-border-bottom-right-radius: 12px;
+ -webkit-border-bottom-left-radius: 12px;
+ -khtml-border-bottom-right-radius: 12px;
+ -khtml-border-bottom-left-radius: 12px;
+ border-bottom-right-radius: 12px;
+ border-bottom-left-radius: 12px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.pagenav span {
- font-weight: bold;
- margin: 0 6px;
-}
-
-.row-title {
- font-size: 12px !important;
- font-weight: bold;
-}
-
-.widefat .column-comment p {
- margin: 0.6em 0;
-}
-
-.column-author img, .column-username img {
- float: left;
- margin-right: 10px;
- margin-top: 3px;
-}
-
-.tablenav a.button-secondary {
</del><ins>+#favorite-actions a {
</ins><span class="cx"> display: block;
</span><del>- margin: 3px 8px 0 0;
-}
-
-.tablenav {
- clear: both;
- height: 30px;
- margin: 6px 0 4px;
- vertical-align: middle;
-}
-
-.tablenav .tablenav-pages {
- float: right;
- display: block;
- cursor: default;
- height: 30px;
- line-height: 30px;
</del><ins>+ text-decoration: none;
</ins><span class="cx"> font-size: 11px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.tablenav .tablenav-pages a,
-.tablenav-pages span.current {
- text-decoration: none;
- border: none;
- padding: 3px 6px;
- border-width: 1px;
- border-style: solid;
- -moz-border-radius: 5px;
- -khtml-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
</del><ins>+#favorite-inside a {
+ padding: 3px 5px 3px 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.tablenav .displaying-num {
- margin-right: 10px;
- font-size: 12px;
- font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
- font-style: italic;
</del><ins>+#favorite-toggle {
+ height: 22px;
+ position: absolute;
+ right: 0;
+ top: 1px;
+ width: 28px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.tablenav .actions {
- padding: 2px 8px 0 0;
</del><ins>+#favorite-actions .slide-down {
+ -moz-border-radius: 12px 12px 0 0;
+ -webkit-border-bottom-right-radius: 0;
+ -webkit-border-bottom-left-radius: 0;
+ -khtml-border-bottom-right-radius: 0;
+ -khtml-border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: 0;
+ border-bottom: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-td.media-icon {
- text-align: center;
- width: 80px;
- padding-top: 8px;
- padding-bottom: 8px;
-}
</del><span class="cx">
</span><del>-td.media-icon img {
- max-width: 80px;
- max-height: 60px;
-}
</del><ins>+/*------------------------------------------------------------------------------
+ 6.2 - Screen Options Tabs
+------------------------------------------------------------------------------*/
</ins><span class="cx">
</span><del>-#update-nag, .update-nag {
- line-height: 19px;
- padding: 5px 0;
- font-size: 12px;
- text-align: center;
- margin: 0 15px;
- border-width: 1px;
- border-style: solid;
- border-top-width: 0;
- border-top-style: none;
- -moz-border-radius: 0 0 6px 6px;
- -webkit-border-bottom-right-radius: 6px;
- -webkit-border-bottom-left-radius: 6px;
- -khtml-border-bottom-right-radius: 6px;
- -khtml-border-bottom-left-radius: 6px;
- border-bottom-right-radius: 6px;
- border-bottom-left-radius: 6px;
</del><ins>+#screen-meta {
+ position: relative;
+ clear: both;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugins .plugin-update {
- padding: 0;
</del><ins>+#screen-meta-links {
+ margin: 0 18px 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.plugin-update .update-message {
- margin: 0 10px 8px 31px;
- font-weight: bold;
-}
-
-#pass-strength-result {
- border-style: solid;
- border-width: 1px;
- float: left;
- margin: 12px 5px 5px 1px;
- padding: 3px 5px;
- text-align: center;
- width: 200px;
- display: none;
-}
-
-.row-actions {
</del><ins>+#screen-meta .screen-reader-text {
</ins><span class="cx"> visibility: hidden;
</span><del>- padding: 2px 0 0;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-tr:hover .row-actions,
-div.comment-item:hover .row-actions {
- visibility: visible;
</del><ins>+#screen-options-link-wrap,
+#contextual-help-link-wrap {
+ float: right;
+ height: 22px;
+ padding: 0;
+ margin: 0 6px 0 0;
+ font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+ background: #e3e3e3;
+ -moz-border-radius-bottomleft: 3px;
+ -moz-border-radius-bottomright: 3px;
+ -webkit-border-bottom-left-radius: 3px;
+ -webkit-border-bottom-right-radius: 3px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.row-actions-visible {
- padding: 2px 0 0;
</del><ins>+#contextual-help-wrap li {
+ list-style-type: disc;
+ margin-left: 18px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* Admin Header */
-#wphead-info {
- margin: 0 0 0 15px;
- padding-right: 15px;
</del><ins>+#screen-meta a.show-settings {
+ text-decoration: none;
+ z-index: 1;
+ padding: 0 16px 0 6px;
+ height: 22px;
+ line-height: 22px;
+ font-size: 10px;
+ display: block;
+ background-repeat: no-repeat;
+ background-position: right bottom;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#user_info {
- float: right;
- font-size: 12px;
- line-height: 46px;
- height: 46px;
</del><ins>+#screen-meta a.show-settings {
+ background-image: url( ../images/screen-options-right.gif?ver=20100531 );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#user_info p {
- margin: 0;
- padding: 0;
- line-height: 46px;
</del><ins>+#screen-meta a.show-settings:hover {
+ text-decoration: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wphead {
- height: 46px;
</del><ins>+#screen-options-wrap h5,
+#contextual-help-wrap h5 {
+ margin: 8px 0;
+ font-size: 13px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wphead a,
-#adminmenu a,
-#sidemenu a,
-#taglist a,
-#catlist a,
-#show-settings a {
- text-decoration: none;
</del><ins>+#screen-options-wrap,
+#contextual-help-wrap {
+ border-style: none solid solid;
+ border-top: 0 none;
+ border-width: 0 1px 1px;
+ margin: 0 15px;
+ padding: 8px 12px 12px;
+ -moz-border-radius: 0 0 0 4px;
+ -webkit-border-bottom-left-radius: 4px;
+ -khtml-border-bottom-left-radius: 4px;
+ border-bottom-left-radius: 4px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#header-logo {
- float: left;
- margin: 7px 0 0 15px;
</del><ins>+.metabox-prefs label {
+ padding-right: 15px;
+ white-space: nowrap;
+ line-height: 30px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wphead h1 {
- font: normal 22px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
- padding: 10px 8px 5px;
- margin: 0;
- float: left;
</del><ins>+.metabox-prefs label input {
+ margin: 0 5px 0 2px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wphead h1.long-title {
- font: normal 18px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
- padding: 12px 10px 5px;
</del><ins>+.metabox-prefs label a {
+ display: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wphead #privacy-on-link {
- font-size: 50%;
- font-style: normal;
- line-height: 17px;
- padding: 0 6px;
- vertical-align: middle;
-}
</del><span class="cx">
</span><del>-#wphead h1 a:hover {
- text-decoration:none;
-}
-#wphead h1 a:hover #site-title,
-#wphead h1 a#privacy-on-link:hover {
- text-decoration:underline;
-}
</del><ins>+/*------------------------------------------------------------------------------
+ 7.0 - Main Navigation (Left Menu)
+------------------------------------------------------------------------------*/
</ins><span class="cx">
</span><span class="cx"> /* side admin menu */
</span><span class="cx"> #adminmenu * {
</span><span class="lines">@@ -1199,9 +1066,6 @@
</span><span class="cx"> padding: 6px 0 0 1px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* end side admin menu */
-
-/* comments/plugins bubble in menu */
</del><span class="cx"> #adminmenu #awaiting-mod,
</span><span class="cx"> #adminmenu span.update-plugins,
</span><span class="cx"> #sidemenu li a span.update-plugins {
</span><span class="lines">@@ -1229,9 +1093,7 @@
</span><span class="cx"> #sidemenu li a .count-0 {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><del>-/* end menu stuff */
</del><span class="cx">
</span><del>-/* comments bubble */
</del><span class="cx"> .post-com-count-wrapper {
</span><span class="cx"> min-width: 22px;
</span><span class="cx"> font-family: Helvetica, Arial, sans-serif;
</span><span class="lines">@@ -1285,80 +1147,118 @@
</span><span class="cx"> padding: 4px 8px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* Admin Footer */
-#footer {
- margin-top: -46px;
- border-top: 1px;
- border-style: solid;
</del><ins>+
+/*------------------------------------------------------------------------------
+ 8.0 - Layout Blocks
+------------------------------------------------------------------------------*/
+
+body.wp-admin {
+ min-width: 785px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#footer,
-#footer a {
- font-size: 12px;
- font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
- font-style: italic;
</del><ins>+.narrow {
+ width: 70%;
+ margin-bottom: 40px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#footer p {
- margin: 0;
- padding: 15px;
- line-height: 15px;
</del><ins>+.narrow p {
+ line-height: 150%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#footer a {
- text-decoration: none;
</del><ins>+.widefat th,
+.widefat td {
+ overflow: hidden;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#footer a:hover {
- text-decoration: underline;
</del><ins>+.widefat td p {
+ margin: 2px 0 0.8em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* Tables used on comment.php and option/setting pages */
</del><ins>+.widefat .column-comment p {
+ margin: 0.6em 0;
+}
</ins><span class="cx">
</span><del>-.form-table {
- border-collapse: collapse;
- margin-top: 0.5em;
- width: 100%;
- margin-bottom: -8px;
- clear: both;
</del><ins>+.widget .widget-top,
+.postbox h3 {
+ cursor: move;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -khtml-user-select: none;
+ user-select: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.form-table td {
- margin-bottom: 9px;
- padding: 8px 10px;
- line-height: 20px;
- font-size: 11px;
</del><ins>+.postbox-container {
+ float: left;
+ padding-right: 0.5%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.form-table th,
-.form-wrap label {
</del><ins>+.postbox-container .meta-box-sortables {
+ min-height: 300px;
+}
+
+.postbox .hndle span {
+ padding: 6px 0;
+}
+
+.postbox .hndle {
+ cursor: move;
+}
+
+.hndle a {
+ font-size: 11px;
</ins><span class="cx"> font-weight: normal;
</span><del>- text-shadow: rgba(255,255,255,1) 0 1px 0;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-.form-table th {
- vertical-align: top;
- text-align: left;
- padding: 10px;
- width: 200px;
</del><ins>+.postbox .handlediv {
+ float: right;
+ width: 23px;
+ height: 26px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.form-table th.th-full {
- width: auto;
</del><ins>+.sortable-placeholder {
+ border-width: 1px;
+ border-style: dashed;
+ margin-bottom: 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.form-table div.color-option {
- display: block;
- clear: both;
- margin-top: 12px;
</del><ins>+.widget,
+.postbox,
+.stuffbox {
+ margin-bottom: 20px;
+ border-width: 1px;
+ border-style: solid;
+ line-height: 1;
+ -moz-border-radius: 6px;
+ -khtml-border-radius: 6px;
+ -webkit-border-radius: 6px;
+ border-radius: 6px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.form-table input.tog {
- margin-top: 2px;
- margin-right: 2px;
- float: left;
</del><ins>+.widget .widget-top,
+.postbox h3,
+.postbox h3,
+.stuffbox h3 {
+ -moz-border-radius: 6px 6px 0 0;
+ -webkit-border-top-right-radius: 6px;
+ -webkit-border-top-left-radius: 6px;
+ -khtml-border-top-right-radius: 6px;
+ -khtml-border-top-left-radius: 6px;
+ border-top-right-radius: 6px;
+ border-top-left-radius: 6px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/* TODO: Review this was a conflict - PJW */
+.postbox.closed h3 {
+ -moz-border-radius-bottomleft: 4px;
+ -webkit-border-bottom-left-radius: 4px;
+ -khtml-border-bottom-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ -moz-border-radius-bottomright: 4px;
+ -webkit-border-bottom-right-radius: 4px;
+ -khtml-border-bottom-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+}
+
</ins><span class="cx"> .form-table td p {
</span><span class="cx"> margin-top: 4px;
</span><span class="cx"> }
</span><span class="lines">@@ -1368,439 +1268,530 @@
</span><span class="cx"> float: left;
</span><span class="cx"> margin: -12px 3px 11px;
</span><span class="cx"> }
</span><ins>+/* Conflict END */
</ins><span class="cx">
</span><del>-.form-table .color-palette td {
- border-width: 1px 1px 0;
- border-style: solid solid none;
- height: 10px;
- line-height: 20px;
- width: 10px;
</del><ins>+.postbox table.form-table {
+ margin-bottom: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-input.large-text,
-textarea.large-text {
- width: 99%;
</del><ins>+.postbox input[type="text"],
+.postbox textarea,
+.stuffbox input[type="text"],
+.stuffbox textarea {
+ border-width: 1px;
+ border-style: solid;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-input.regular-text,
-#adduser .form-field input {
- width: 25em;
</del><ins>+.temp-border {
+ border: 1px dotted #ccc;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-input.small-text {
- width: 50px;
</del><ins>+.columns-prefs label {
+ padding: 0 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#profile-page .form-table textarea {
- width: 500px;
- margin-bottom: 6px;
</del><ins>+
+/*------------------------------------------------------------------------------
+ 9.0 - Dashboard
+------------------------------------------------------------------------------*/
+
+#wpbody-content .metabox-holder {
+ padding-top: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#profile-page .form-table #rich_editing {
- margin-right: 5px
</del><ins>+#dashboard-widgets .meta-box-sortables {
+ margin: 0 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.form-table .pre {
- padding: 8px;
- margin: 0;
</del><ins>+#dashboard_recent_comments div.undo {
+ border-top-style: solid;
+ border-top-width: 1px;
+ margin: 0 -10px;
+ padding: 3px 8px;
+ font-size: 11px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.pre {
- /* http://www.longren.org/2006/09/27/wrapping-text-inside-pre-tags/ */
- white-space: pre-wrap; /* css-3 */
- white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
- white-space: -pre-wrap; /* Opera 4-6 */
- white-space: -o-pre-wrap; /* Opera 7 */
- word-wrap: break-word; /* Internet Explorer 5.5+ */
</del><ins>+#the-comment-list td.comment p.comment-author {
+ margin-top: 0;
+ margin-left: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-table.form-table td .updated {
- font-size: 13px;
</del><ins>+#the-comment-list p.comment-author img {
+ float: left;
+ margin-right: 8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* divs for cats and tags pages */
</del><ins>+#the-comment-list p.comment-author strong a {
+ border: none;
+}
</ins><span class="cx">
</span><del>-.form-wrap {
- margin: 10px 0;
- width: 97%;
</del><ins>+#the-comment-list td {
+ vertical-align: top;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.form-wrap p,
-.form-wrap label {
- font-size: 11px;
</del><ins>+#the-comment-list td.comment {
+ word-wrap: break-word;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.form-wrap label {
</del><ins>+#the-comment-list .check-column {
+ padding-top: 8px;
+}
+
+
+/*------------------------------------------------------------------------------
+ 10.0 - List Posts (/Pages/etc)
+------------------------------------------------------------------------------*/
+
+table.fixed {
+ table-layout: fixed;
+}
+.fixed .column-rating,
+.fixed .column-visible {
+ width: 8%;
+}
+.fixed .column-date,
+.fixed .column-parent,
+.fixed .column-links {
+ width: 10%;
+}
+.fixed .column-response,
+.fixed .column-author,
+.fixed .column-categories,
+.fixed .column-tags,
+.fixed .column-rel,
+.fixed .column-role {
+ width: 15%;
+}
+.fixed .column-comments {
+ width: 4em;
+ padding: 8px 0;
+ text-align: left;
+}
+.fixed .column-comments .vers {
+ padding-left: 3px;
+}
+.fixed .column-comments a {
+ float: left;
+}
+.fixed .column-slug {
+ width: 25%;
+}
+.fixed .column-posts {
+ width: 10%;
+}
+.fixed .column-icon {
+ width: 80px;
+}
+#commentsdiv .fixed .column-author,
+#comments-form .fixed .column-author {
+ width: 20%;
+}
+
+.sorting-indicator {
+ display: none;
+ float: left;
+ width: 21px;
+ height: 4px;
+ margin-top: 5px;
+}
+th.sortable a, th.sorted-asc a, th.sorted-desc a {
+ float: left;
+}
+th.sorted-asc .sorting-indicator, th.sorted-desc:hover .sorting-indicator, th.sortable:hover .sorting-indicator {
</ins><span class="cx"> display: block;
</span><del>- padding: 2px;
- font-size: 12px;
</del><ins>+ background: url(../images/sort_asc.gif) no-repeat scroll 0 0;
</ins><span class="cx"> }
</span><ins>+th.sorted-desc .sorting-indicator, th.sorted-asc:hover .sorting-indicator {
+ display: block;
+ background: url(../images/sort_desc.gif) no-repeat scroll 0 0;
+}
</ins><span class="cx">
</span><del>-.form-field input,
-.form-field textarea {
- border-style: solid;
- border-width: 1px;
- width: 95%;
</del><ins>+/* Bulk Actions */
+
+.tablenav-pages a {
+ border-bottom-style: solid;
+ border-bottom-width: 2px;
+ font-weight: bold;
+ margin-right: 1px;
+ padding: 0 2px;
</ins><span class="cx"> }
</span><ins>+.tablenav-pages .current-page {
+ text-align: center;
+}
+.tablenav-pages .next-page {
+ margin-left: 2px;
+}
</ins><span class="cx">
</span><del>-p.description,
-.form-wrap p {
- margin: 2px 0 5px;
</del><ins>+.tablenav a.button-secondary {
+ display: block;
+ margin: 3px 8px 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-p.help,
-p.description,
-span.description,
-.form-wrap p {
</del><ins>+.tablenav {
+ clear: both;
+ height: 30px;
+ margin: 6px 0 4px;
+ vertical-align: middle;
+}
+
+.tablenav .tablenav-pages {
+ float: right;
+ display: block;
+ cursor: default;
+ height: 30px;
+ line-height: 30px;
+ font-size: 11px;
+}
+
+.tablenav .tablenav-pages a,
+.tablenav-pages span.current {
+ text-decoration: none;
+ border: none;
+ padding: 3px 6px;
+ border-width: 1px;
+ border-style: solid;
+ -moz-border-radius: 5px;
+ -khtml-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+}
+
+/* TODO: Review this was a conflict - font-family - PJW */
+.tablenav .displaying-num {
+ margin-right: 10px;
</ins><span class="cx"> font-size: 12px;
</span><ins>+ font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
</ins><span class="cx"> font-style: italic;
</span><span class="cx"> font-family: Verdana, Arial, "Bitstream Vera Sans", sans-serif;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.form-wrap .form-field {
- margin: 0 0 10px;
- padding: 8px;
</del><ins>+.tablenav .actions {
+ padding: 2px 8px 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.col-wrap h3 {
- margin: 12px 0;
- font-size: 1.1em;
</del><ins>+.tablenav .delete {
+ margin-right: 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.col-wrap p.submit {
- margin-top: -10px;
</del><ins>+.view-switch {
+ float: right;
+ margin: 6px 8px 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.tagcloud {
- width: 97%;
- margin: 0 0 40px;
- text-align: justify;
</del><ins>+.view-switch a {
+ text-decoration: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.tagcloud h3 {
- margin: 2px 0 12px;
</del><ins>+.filter {
+ float: left;
+ margin: -5px 0 0 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* Post Screen */
-#post-body #normal-sortables {
- min-height: 50px;
</del><ins>+.filter .subsubsub {
+ margin-left: -10px;
+ margin-top: 13px;
</ins><span class="cx"> }
</span><del>-
-#post-body #advanced-sortables {
- min-height: 20px;
</del><ins>+.screen-per-page {
+ width: 3em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.postbox {
- position: relative;
- min-width: 255px;
- width: 99.5%;
</del><ins>+#posts-filter fieldset {
+ float: left;
+ margin: 0 1.5ex 1em 0;
+ padding: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#trackback_url {
- width: 99%;
</del><ins>+#posts-filter fieldset legend {
+ padding: 0 0 .2em 1px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#normal-sortables .postbox .submit {
- background: transparent none;
- border: 0 none;
- float: right;
- padding: 0 12px;
- margin: 0;
</del><ins>+
+/*------------------------------------------------------------------------------
+ 10.1 - Inline Editing
+------------------------------------------------------------------------------*/
+
+/*
+.quick-edit* is for Quick Edit
+.bulk-edit* is for Bulk Edit
+.inline-edit* is for everything
+*/
+
+/* Layout */
+tr.inline-edit-row td {
+ padding: 0 0.5em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#normal-sortables .postbox #replyrow .submit {
- float: none;
</del><ins>+#wpbody-content .inline-edit-row fieldset {
+ font-size: 12px;
+ float: left;
</ins><span class="cx"> margin: 0;
</span><del>- padding: 3px 7px;
</del><ins>+ padding: 0;
+ width: 100%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#side-sortables .submitbox .submit input,
-#side-sortables .submitbox .submit .preview,
-#side-sortables .submitbox .submit a.preview:hover {
- border: 0 none;
</del><ins>+#wpbody-content .inline-edit-row fieldset .inline-edit-col {
+ padding: 0 0.5em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#side-sortables .inside-submitbox .insidebox,
-.stuffbox .insidebox {
- margin: 11px 0;
</del><ins>+#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col {
+ border-width: 0 0 0 1px;
+ border-style: none none none solid;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#side-sortables .comments-box,
-#normal-sortables .comments-box {
- border: 0 none;
</del><ins>+#wpbody-content .quick-edit-row-post .inline-edit-col-left {
+ width: 40%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#side-sortables .comments-box thead th,
-#normal-sortables .comments-box thead th {
- background: transparent;
- padding: 0 7px 4px;
- font-style: italic;
</del><ins>+#wpbody-content .quick-edit-row-post .inline-edit-col-right {
+ width: 39%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#commentsdiv img.waiting {
- padding-left: 5px;
- vertical-align: middle;
</del><ins>+#wpbody-content .inline-edit-row-post .inline-edit-col-center {
+ width: 20%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body .tagsdiv #newtag {
- margin-right: 5px;
- width: 16em;
</del><ins>+#wpbody-content .quick-edit-row-page .inline-edit-col-left {
+ width: 50%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#side-sortables input#post_password {
- width: 94%
</del><ins>+#wpbody-content .quick-edit-row-page .inline-edit-col-right,
+#wpbody-content .bulk-edit-row-post .inline-edit-col-right {
+ width: 49%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#side-sortables .tagsdiv #newtag {
- width: 68%;
</del><ins>+#wpbody-content .bulk-edit-row .inline-edit-col-left {
+ width: 30%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#post-status-info {
- border-width: 0 1px 1px;
- border-style: none solid solid;
- width: 100%;
- -moz-border-radius: 0 0 6px 6px;
- -webkit-border-bottom-left-radius: 6px;
- -webkit-border-bottom-right-radius: 6px;
- -khtml-border-bottom-left-radius: 6px;
- -khtml-border-bottom-right-radius: 6px;
- border-bottom-left-radius: 6px;
- border-bottom-right-radius: 6px;
</del><ins>+#wpbody-content .bulk-edit-row-page .inline-edit-col-right {
+ width: 69%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#post-status-info td {
- font-size: 11px;
</del><ins>+#wpbody-content .bulk-edit-row .inline-edit-col-bottom {
+ float: right;
+ width: 69%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.autosave-info {
- padding: 2px 15px 2px 2px;
- text-align: right;
</del><ins>+#wpbody-content .inline-edit-row-page .inline-edit-col-right,
+#owpbody-content .bulk-edit-row-post .inline-edit-col-right {
+ margin-top: 27px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#editorcontent #post-status-info {
- border: none;
</del><ins>+.inline-edit-row fieldset .inline-edit-group {
+ clear: both;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body .wp_themeSkin .mceStatusbar a.mceResize {
</del><ins>+.inline-edit-row fieldset .inline-edit-group:after {
+ content: ".";
</ins><span class="cx"> display: block;
</span><del>- background: transparent url(../images/resize.gif) no-repeat scroll right bottom;
- width: 12px;
- cursor: se-resize;
- margin: 0 2px;
- position: relative;
- top: 22px;
</del><ins>+ height: 0;
+ clear: both;
+ visibility: hidden;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#linksubmitdiv div.inside,
-div.inside {
- padding: 0;
- margin: 0;
</del><ins>+.inline-edit-row p.submit {
+ clear: both;
+ padding: 0.5em;
+ margin: 0.5em 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#comment-status-radio p {
- margin: 3px 0 5px;
</del><ins>+.inline-edit-row span.error {
+ line-height: 22px;
+ margin: 0 15px;
+ padding: 3px 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#comment-status-radio input {
- margin: 2px 3px 5px 0;
- vertical-align: middle;
</del><ins>+/* Positioning */
+.inline-edit-row h4 {
+ margin: .2em 0;
+ padding: 0;
+ line-height: 23px;
</ins><span class="cx"> }
</span><ins>+.inline-edit-row fieldset span.title,
+.inline-edit-row fieldset span.checkbox-title {
+ margin: 0;
+ padding: 0;
+ line-height: 27px;
+}
</ins><span class="cx">
</span><del>-#comment-status-radio label {
- padding: 5px 0;
</del><ins>+.inline-edit-row fieldset label,
+.inline-edit-row fieldset span.inline-edit-categories-label {
+ display: block;
+ margin: .2em 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.tagchecklist {
- margin-left: 14px;
- font-size: 12px;
- overflow: auto;
</del><ins>+.inline-edit-row fieldset label.inline-edit-tags {
+ margin-top: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.tagchecklist strong {
- margin-left: -8px;
- position: absolute;
</del><ins>+.inline-edit-row fieldset label.inline-edit-tags span.title {
+ margin: .2em 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.tagchecklist span {
- margin-right: 25px;
</del><ins>+.inline-edit-row fieldset label span.title {
</ins><span class="cx"> display: block;
</span><span class="cx"> float: left;
</span><del>- font-size: 11px;
- line-height: 1.8em;
- white-space: nowrap;
- cursor: default;
</del><ins>+ width: 5em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.tagchecklist span a {
- margin: 6px 0pt 0pt -9px;
- cursor: pointer;
- width: 10px;
- height: 10px;
</del><ins>+.inline-edit-row fieldset label span.input-text-wrap {
</ins><span class="cx"> display: block;
</span><del>- float: left;
- text-indent: -9999px;
- overflow: hidden;
- position: absolute;
</del><ins>+ margin-left: 5em;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/* TODO: Review this was a conflict - PJW */
+.quick-edit-row-post fieldset.inline-edit-col-right label span.title {
+ width: auto;
+ padding-right: 0.5em;
+}
</ins><span class="cx"> .howto {
</span><span class="cx"> font-style: italic;
</span><span class="cx"> display: block;
</span><span class="cx"> font-family: Verdana, Arial, "Bitstream Vera Sans", sans-serif;
</span><span class="cx"> }
</span><ins>+/* END Conflict */
</ins><span class="cx">
</span><del>-.ac_results {
- padding: 0;
- margin: 0;
- list-style: none;
- position: absolute;
- z-index: 10000;
- display: none;
- border-width: 1px;
- border-style: solid;
</del><ins>+.inline-edit-row .input-text-wrap input[type=text] {
+ width: 100%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.ac_results li {
- padding: 2px 5px;
- white-space: nowrap;
- text-align: left;
</del><ins>+.inline-edit-row fieldset label input[type=checkbox] {
+ vertical-align: text-bottom;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.ac_over {
- cursor: pointer;
</del><ins>+.inline-edit-row fieldset label textarea {
+ width: 100%;
+ height: 4em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.ac_match {
- text-decoration: underline;
</del><ins>+#wpbody-content .bulk-edit-row fieldset .inline-edit-group label {
+ max-width: 50%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#poststuff h2 {
- margin-top: 20px;
- font-size: 1.5em;
- margin-bottom: 15px;
- padding: 0 0 3px;
- clear: left;
</del><ins>+#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child {
+ margin-right: 0.5em
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget .widget-top,
-.postbox h3 {
- cursor: move;
- -webkit-user-select: none;
- -moz-user-select: none;
- -khtml-user-select: none;
- user-select: none;
</del><ins>+/* Styling */
+.inline-edit-row h4 {
+ text-transform: uppercase;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.postbox .hndle span {
- padding: 6px 0;
</del><ins>+.inline-edit-row fieldset span.title,
+.inline-edit-row fieldset span.checkbox-title {
+ font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+ font-style: italic;
+ line-height: 1.8em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.postbox .hndle {
- cursor: move;
</del><ins>+/* Specific Elements */
+.inline-edit-row fieldset input[type="text"],
+.inline-edit-row fieldset textarea {
+ border-style: solid;
+ border-width: 1px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.hndle a {
- font-size: 11px;
- font-weight: normal;
</del><ins>+.inline-edit-row fieldset .inline-edit-date {
+ float: left;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#dashboard-widgets .meta-box-sortables {
- margin: 0 5px;
</del><ins>+.inline-edit-row fieldset input[name=jj],
+.inline-edit-row fieldset input[name=hh],
+.inline-edit-row fieldset input[name=mn] {
+ font-size: 12px;
+ width: 2.1em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.postbox .handlediv {
- float: right;
- width: 23px;
- height: 26px;
</del><ins>+.inline-edit-row fieldset input[name=aa] {
+ font-size: 12px;
+ width: 3.5em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.sortable-placeholder {
- border-width: 1px;
- border-style: dashed;
- margin-bottom: 20px;
</del><ins>+.inline-edit-row fieldset label input.inline-edit-password-input {
+ width: 8em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#poststuff h3,
-.metabox-holder h3 {
- font-size: 12px;
- font-weight: bold;
- padding: 7px 9px;
- margin: 0;
- line-height: 1;
</del><ins>+.inline-edit-row .catshow,
+.inline-edit-row .cathide {
+ cursor: pointer;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget,
-.postbox,
-.stuffbox {
- margin-bottom: 20px;
</del><ins>+ul.cat-checklist {
+ height: 12em;
+ border-style: solid;
</ins><span class="cx"> border-width: 1px;
</span><del>- border-style: solid;
- line-height: 1;
- -moz-border-radius: 6px;
- -khtml-border-radius: 6px;
- -webkit-border-radius: 6px;
- border-radius: 6px;
</del><ins>+ overflow-y: scroll;
+ padding: 0 5px;
+ margin: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget .widget-top,
-.postbox h3,
-.postbox h3,
-.stuffbox h3 {
- -moz-border-radius: 6px 6px 0 0;
- -webkit-border-top-right-radius: 6px;
- -webkit-border-top-left-radius: 6px;
- -khtml-border-top-right-radius: 6px;
- -khtml-border-top-left-radius: 6px;
- border-top-right-radius: 6px;
- border-top-left-radius: 6px;
</del><ins>+#bulk-titles {
+ display: block;
+ height: 12em;
+ border-style: solid;
+ border-width: 1px;
+ overflow-y: scroll;
+ padding: 0 5px;
+ margin: 0 0 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.postbox.closed h3 {
- -moz-border-radius-bottomleft: 4px;
- -webkit-border-bottom-left-radius: 4px;
- -khtml-border-bottom-left-radius: 4px;
- border-bottom-left-radius: 4px;
- -moz-border-radius-bottomright: 4px;
- -webkit-border-bottom-right-radius: 4px;
- -khtml-border-bottom-right-radius: 4px;
- border-bottom-right-radius: 4px;
</del><ins>+.inline-edit-row fieldset ul.cat-checklist li,
+.inline-edit-row fieldset ul.cat-checklist input {
+ margin: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.postbox table.form-table {
- margin-bottom: 0;
</del><ins>+.inline-edit-row fieldset ul.cat-checklist label,
+.inline-edit-row .catshow,
+.inline-edit-row .cathide,
+.inline-edit-row #bulk-titles div {
+ font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+ font-style: normal;
+ font-size: 11px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.postbox input[type="text"],
-.postbox textarea,
-.stuffbox input[type="text"],
-.stuffbox textarea {
- border-width: 1px;
- border-style: solid;
</del><ins>+table .inline-edit-row fieldset ul.cat-hover {
+ height: auto;
+ max-height: 30em;
+ overflow-y: auto;
+ position: absolute;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#poststuff .inside,
-#poststuff .inside p {
- font-size: 11px;
- margin: 6px 6px 8px;
</del><ins>+.inline-edit-row fieldset label input.inline-edit-menu-order-input {
+ width: 3em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#poststuff .inside .submitbox p {
- margin: 1em 0;
</del><ins>+.inline-edit-row fieldset label input.inline-edit-slug-input {
+ width: 75%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#post-visibility-select {
- line-height: 1.5em;
- margin-top: 3px;
</del><ins>+.quick-edit-row-post fieldset label.inline-edit-status {
+ float: left;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#poststuff #submitdiv .inside {
- margin: 0;
</del><ins>+#bulk-titles {
+ line-height: 140%;
</ins><span class="cx"> }
</span><ins>+#bulk-titles div {
+ margin: 0.2em 0.3em;
+}
</ins><span class="cx">
</span><del>-#titlediv, #poststuff .postarea {
- margin-bottom: 20px;
</del><ins>+#bulk-titles div a {
+ cursor: pointer;
+ display: block;
+ float: left;
+ height: 10px;
+ margin: 3px 3px 0 -2px;
+ overflow: hidden;
+ position: relative;
+ text-indent: -9999px;
+ width: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+
+/*------------------------------------------------------------------------------
+ 11.0 - Write/Edit Post Screen
+------------------------------------------------------------------------------*/
+
</ins><span class="cx"> #titlediv {
</span><span class="cx"> position: relative;
</span><span class="cx"> margin-bottom: 20px;
</span><span class="lines">@@ -1970,24 +1961,33 @@
</span><span class="cx"> margin-top: 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* Categories */
</del><ins>+/* Post Screen */
+#post-body #normal-sortables {
+ min-height: 50px;
+}
</ins><span class="cx">
</span><del>-.category-adder {
- margin-left: 120px;
- padding: 4px 0;
</del><ins>+#post-body #advanced-sortables {
+ min-height: 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.category-adder h4 {
- margin: 0 0 8px;
</del><ins>+.postbox {
+ position: relative;
+ min-width: 255px;
+ width: 99.5%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#side-sortables .category-adder {
- margin: 0;
</del><ins>+#trackback_url {
+ width: 99%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body .category-add input, .category-add select {
- width: 30%;
</del><ins>+/* TODO: Review this was a conflict - PJW */
+#normal-sortables .postbox .submit {
+ background: transparent none;
+ border: 0 none;
+ float: right;
+ padding: 0 12px;
</ins><span class="cx"> }
</span><ins>+/* END */
</ins><span class="cx">
</span><span class="cx"> #side-sortables .category-add input {
</span><span class="cx"> width: 94%;
</span><span class="lines">@@ -2095,35 +2095,43 @@
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#front-page-warning,
-#front-static-pages ul,
-.inline-editor ul.cat-checklist ul,
-.categorydiv ul.categorychecklist ul,
-.customlinkdiv ul.categorychecklist ul,
-.posttypediv ul.categorychecklist ul,
-.taxonomydiv ul.categorychecklist ul,
-#linkcategorydiv ul.categorychecklist ul {
- margin-left: 18px;
</del><ins>+/* TODO: Review this was a conflict - PJW */
+#normal-sortables .postbox #replyrow .submit {
+ float: none;
+ margin: 0;
+ padding: 3px 7px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ul.categorychecklist li {
- margin: 0;
- padding: 0;
- line-height: 19px;
- word-wrap: break-word;
</del><ins>+#side-sortables .submitbox .submit input,
+#side-sortables .submitbox .submit .preview,
+#side-sortables .submitbox .submit a.preview:hover {
+ border: 0 none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.category-adder h4 {
- margin-top: 4px;
- margin-bottom: 0px;
</del><ins>+#side-sortables .inside-submitbox .insidebox,
+.stuffbox .insidebox {
+ margin: 11px 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#side-sortables .comments-box,
+#normal-sortables .comments-box {
+ border: 0 none;
+}
</ins><span class="cx"> ul.category-tabs,
</span><span class="cx"> ul.add-menu-item-tabs,
</span><span class="cx"> ul.wp-tab-bar {
</span><span class="cx"> margin-top: 12px;
</span><span class="cx"> }
</span><ins>+/* END Conflict */
</ins><span class="cx">
</span><ins>+/* TODO: Review this was a conflict - PJW */
+#side-sortables .comments-box thead th,
+#normal-sortables .comments-box thead th {
+ background: transparent;
+ padding: 0 7px 4px;
+ font-style: italic;
+}
+
</ins><span class="cx"> ul.category-tabs li.tabs,
</span><span class="cx"> ul.add-menu-item-tabs li.tabs,
</span><span class="cx"> .wp-tab-active {
</span><span class="lines">@@ -2131,6 +2139,11 @@
</span><span class="cx"> border-width: 1px 1px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#commentsdiv img.waiting {
+ padding-left: 5px;
+}
+/* END Conflcit */
+
</ins><span class="cx"> #post-body .category-tabs li.tabs,
</span><span class="cx"> #post-body .add-menu-item-tabs li.tabs {
</span><span class="cx"> border-style: solid none solid solid;
</span><span class="lines">@@ -2202,103 +2215,59 @@
</span><span class="cx"> vertical-align: text-top;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* TODO: Review this was a conflict - PJW */
</ins><span class="cx"> .defaultavatarpicker .avatar {
</span><span class="cx"> margin: 2px 0;
</span><span class="cx"> vertical-align: middle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.wp-admin {
- min-width: 785px;
</del><ins>+#post-body .tagsdiv #newtag {
+ margin-right: 5px;
+ width: 16em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.view-switch {
- float: right;
- margin: 6px 8px 0;
</del><ins>+#side-sortables input#post_password {
+ width: 94%
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.view-switch a {
- text-decoration: none;
</del><ins>+#side-sortables .tagsdiv #newtag {
+ width: 68%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.filter {
- float: left;
- margin: -5px 0 0 10px;
</del><ins>+#post-status-info {
+ border-width: 0 1px 1px;
+ border-style: none solid solid;
+ width: 100%;
+ -moz-border-radius: 0 0 6px 6px;
+ -webkit-border-bottom-left-radius: 6px;
+ -webkit-border-bottom-right-radius: 6px;
+ -khtml-border-bottom-left-radius: 6px;
+ -khtml-border-bottom-right-radius: 6px;
+ border-bottom-left-radius: 6px;
+ border-bottom-right-radius: 6px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.filter .subsubsub {
- margin-left: -10px;
- margin-top: 13px;
</del><ins>+#post-status-info td {
+ font-size: 11px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#the-comment-list td.comment p.comment-author {
- margin-top: 0;
- margin-left: 0;
-}
-
-#the-comment-list p.comment-author img {
- float: left;
- margin-right: 8px;
-}
-
-#the-comment-list p.comment-author strong a {
- border: none;
-}
-
-#the-comment-list td {
- vertical-align: top;
-}
-
-#the-comment-list td.comment {
- word-wrap: break-word;
-}
-
-#the-comment-list .check-column {
- padding-top: 8px;
-}
-
-#templateside ul li a {
- text-decoration: none;
-}
-
-.indicator-hint {
- padding-top: 8px;
-}
-
-#display_name {
- width: 15em;
-}
-
-.tablenav .delete {
- margin-right: 20px;
-}
-
-td.action-links,
-th.action-links {
</del><ins>+.autosave-info {
+ padding: 2px 15px 2px 2px;
</ins><span class="cx"> text-align: right;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* Diff */
-
-table.diff {
- width: 100%;
-}
-
-table.diff col.content {
- width: 50%;
-}
-
-table.diff tr {
- background-color: transparent;
-}
-
-table.diff td, table.diff th {
- padding: .5em;
- font-family: Consolas, Monaco, Courier, monospace;
</del><ins>+#editorcontent #post-status-info {
</ins><span class="cx"> border: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-table.diff .diff-deletedline del, table.diff .diff-addedline ins {
- text-decoration: none;
</del><ins>+#post-body .wp_themeSkin .mceStatusbar a.mceResize {
+ display: block;
+ background: transparent url(../images/resize.gif) no-repeat scroll right bottom;
+ width: 12px;
+ cursor: se-resize;
+ margin: 0 2px;
+ position: relative;
+ top: 22px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #wp-word-count {
</span><span class="lines">@@ -2306,61 +2275,6 @@
</span><span class="cx"> padding: 2px 7px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-fieldset {
- border: 0;
- padding: 0;
- margin: 0;
-}
-
-.tool-box {
- margin: 15px 0 35px;
-}
-
-.tool-box .buttons {
- margin: 15px 0;
-}
-
-.tool-box .title {
- margin: 8px 0;
- font: 18px/24px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-}
-
-.pressthis a {
- font-size: 1.2em;
-}
-
-#wp_editbtns,
-#wp_gallerybtns {
- padding: 2px;
- position: absolute;
- display: none;
- z-index: 999998;
-}
-
-#wp_editimgbtn,
-#wp_delimgbtn,
-#wp_editgallery,
-#wp_delgallery {
- margin: 2px;
- padding: 2px;
- border-width: 1px;
- border-style: solid;
- -moz-border-radius: 3px;
- -khtml-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
-}
-
-.settings-toggle {
- text-align: right;
- margin: 5px 7px 15px 0;
- font-size: 12px;
-}
-
-.settings-toggle h3 {
- margin: 0;
-}
-
</del><span class="cx"> #timestampdiv select {
</span><span class="cx"> height: 20px;
</span><span class="cx"> line-height: 14px;
</span><span class="lines">@@ -2400,176 +2314,119 @@
</span><span class="cx"> border-style: solid;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* media popup 0819 */
-#sidemenu {
- margin: -30px 15px 0 315px;
- list-style: none;
- position: relative;
- float: right;
- padding-left: 10px;
- font-size: 12px;
-}
</del><span class="cx">
</span><del>-#sidemenu a {
- padding: 0 7px;
- display: block;
- float: left;
- line-height: 28px;
- border-top-width: 1px;
- border-top-style: solid;
- border-bottom-width: 1px;
- border-bottom-style: solid;
-}
</del><ins>+/*------------------------------------------------------------------------------
+ 11.1 - Custom Fields
+------------------------------------------------------------------------------*/
</ins><span class="cx">
</span><del>-#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;
- -moz-border-radius: 4px 4px 0 0;
- -webkit-border-top-left-radius: 4px;
- -webkit-border-top-right-radius: 4px;
- -khtml-border-top-left-radius: 4px;
- -khtml-border-top-right-radius: 4px;
- border-top-left-radius: 4px;
- border-top-right-radius: 4px;
</del><ins>+#postcustomstuff table,
+#postcustomstuff input,
+#postcustomstuff textarea {
</ins><span class="cx"> border-width: 1px;
</span><span class="cx"> border-style: solid;
</span><ins>+ -moz-border-radius: 3px;
+ -khtml-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#sidemenu {
- margin: -30px 15px 0 315px;
- list-style: none;
- position: relative;
- float: right;
- padding-left: 10px;
- font-size: 12px;
</del><ins>+#postcustomstuff .updatemeta,
+#postcustomstuff .deletemeta {
+ margin: auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#sidemenu a {
- padding: 0 7px;
- display: block;
- float: left;
- line-height: 28px;
- border-top-width: 1px;
- border-top-style: solid;
- border-bottom-width: 1px;
- border-bottom-style: solid;
</del><ins>+#postcustomstuff thead th {
+ padding: 5px 8px 8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#sidemenu li a .count-0 {
- display: none;
</del><ins>+#postcustom #postcustomstuff .submit {
+ border: 0 none;
+ float: none;
+ padding: 5px 8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* reply to comments */
-#replyrow {
- font-size: 11px;
</del><ins>+#side-sortables #postcustom #postcustomstuff .submit {
+ padding: 0 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#replyrow input {
- border-width: 1px;
- border-style: solid;
</del><ins>+#side-sortables #postcustom #postcustomstuff td.left input {
+ margin: 3px 3px 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#replyrow td {
- padding: 2px;
</del><ins>+#side-sortables #postcustom #postcustomstuff #the-list textarea {
+ height: 85px;
+ margin: 3px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#replyrow #editorcontainer {
- border: 0 none;
-}
-
-#replysubmit {
</del><ins>+#postcustomstuff table {
</ins><span class="cx"> margin: 0;
</span><del>- padding: 3px 7px;
</del><ins>+ width: 100%;
+ border-width: 1px;
+ border-style: solid;
+ border-spacing: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#replysubmit img.waiting,
-.inline-edit-save img.waiting {
- padding: 4px 10px 0;
- vertical-align: top;
- float: right;
</del><ins>+#postcustomstuff table input,
+#postcustomstuff table select,
+#postcustomstuff table textarea {
+ width: 95%;
+ margin: 8px 0 8px 8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#replysubmit .button {
- margin-right: 5px;
</del><ins>+#postcustomstuff th.left,
+#postcustomstuff td.left {
+ width: 38%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#replyrow #editor-toolbar {
- display: none;
</del><ins>+#postcustomstuff .submit input {
+ width: auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#replyhead {
- font-size: 12px;
- font-weight: bold;
- padding: 2px 10px 4px;
</del><ins>+#postcustomstuff #newmeta .submit {
+ padding: 0 8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#edithead .inside {
- float: left;
- padding: 3px 0 2px 5px;
- margin: 0;
- text-align: center;
- font-size: 11px;
</del><ins>+#postcustomstuff table #addmetasub {
+ width: auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#edithead .inside input {
- width: 180px;
- font-size: 11px;
</del><ins>+#postcustomstuff #newmetaleft {
+ vertical-align: top;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#edithead label {
- padding: 2px 0;
</del><ins>+#postcustomstuff #newmetaleft a {
+ padding: 0 10px;
+ text-decoration: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#replycontainer {
- padding: 5px;
- border: 0 none;
- height: 120px;
- overflow: hidden;
- position: relative;
-}
</del><span class="cx">
</span><del>-#replycontent {
- resize: none;
- margin: 0;
</del><ins>+/*------------------------------------------------------------------------------
+ 11.2 - Post Revisions
+------------------------------------------------------------------------------*/
+
+table.diff {
</ins><span class="cx"> width: 100%;
</span><del>- height: 100%;
- padding: 0;
- line-height: 150%;
- border: 0 none;
- outline: none;
- font-size: 12px;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#replyrow #ed_reply_toolbar {
- margin: 0;
- padding: 2px 3px;
</del><ins>+table.diff col.content {
+ width: 50%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* show/hide settings */
-#screen-meta {
- position: relative;
- clear: both;
</del><ins>+table.diff tr {
+ background-color: transparent;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#screen-meta-links {
- margin: 0 18px 0 0;
</del><ins>+table.diff td, table.diff th {
+ padding: .5em;
+ font-family: Consolas, Monaco, Courier, monospace;
+ border: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#screen-meta .screen-reader-text {
- visibility: hidden;
</del><ins>+table.diff .diff-deletedline del, table.diff .diff-addedline ins {
+ text-decoration: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/* TODO: Review this was a conflict - PJW */
</ins><span class="cx"> #screen-options-link-wrap,
</span><span class="cx"> #contextual-help-link-wrap {
</span><span class="cx"> float: right;
</span><span class="lines">@@ -2583,39 +2440,41 @@
</span><span class="cx"> -webkit-border-bottom-left-radius: 3px;
</span><span class="cx"> -webkit-border-bottom-right-radius: 3px;
</span><span class="cx"> }
</span><ins>+/* END */
</ins><span class="cx">
</span><del>-#contextual-help-wrap li {
- list-style-type: disc;
- margin-left: 18px;
</del><ins>+/*------------------------------------------------------------------------------
+ 12.0 - Categories
+------------------------------------------------------------------------------*/
+
+.category-adder {
+ margin-left: 120px;
+ padding: 4px 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#screen-meta a.show-settings {
- text-decoration: none;
- z-index: 1;
- padding: 0 16px 0 6px;
- height: 22px;
- line-height: 22px;
- font-size: 10px;
- display: block;
- background-repeat: no-repeat;
- background-position: right bottom;
</del><ins>+/* TODO: Review this was a conflict - PJW */
+.category-adder h4 {
+ margin: 0 0 8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #screen-meta a.show-settings {
</span><span class="cx"> background-image: url( ../images/screen-options-toggle.gif?ver=20100531 );
</span><span class="cx"> background-position: top right;
</span><span class="cx"> }
</span><ins>+/* END */
</ins><span class="cx">
</span><del>-#screen-meta a.show-settings:hover {
- text-decoration: none;
</del><ins>+#side-sortables .category-adder {
+ margin: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#screen-options-wrap h5,
-#contextual-help-wrap h5 {
- margin: 8px 0;
- font-size: 13px;
</del><ins>+#post-body .category-add input, .category-add select {
+ width: 30%;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/* TODO: Review this was a conflict - PJW */
+#side-sortables .category-add input {
+ width: 94%;
+}
+
</ins><span class="cx"> #screen-options-wrap,
</span><span class="cx"> #contextual-help-wrap {
</span><span class="cx"> border-style: none solid solid;
</span><span class="lines">@@ -2628,243 +2487,280 @@
</span><span class="cx"> -khtml-border-radius: 0 0 4px 4px;
</span><span class="cx"> border-radius: 0 0 4px 4px;
</span><span class="cx"> }
</span><ins>+/* END */
</ins><span class="cx">
</span><del>-.metabox-prefs label {
- padding-right: 15px;
- white-space: nowrap;
- line-height: 30px;
</del><ins>+#side-sortables .category-add select {
+ width: 100%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.metabox-prefs label input {
- margin: 0 5px 0 2px;
</del><ins>+#side-sortables .category-add input.category-add-sumbit, #post-body .category-add input.category-add input.category-add-sumbit {
+ width: auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.metabox-prefs label a {
- display: none;
</del><ins>+#post-body ul.category-tabs,
+#post-body ul.add-menu-item-tabs {
+ float: left;
+ width: 120px;
+ text-align: right;
+ /* Negative margin for the sake of those without JS: all tabs display */
+ margin: 0 -120px 0 5px;
+ padding: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* Inline Editor
- .quick-edit* is for Quick Edit
- .bulk-edit* is for Bulk Edit
- .inline-edit* is for everything
-*/
-/* Layout */
-tr.inline-edit-row td {
- padding: 0 0.5em;
</del><ins>+#post-body ul.category-tabs li,
+#post-body ul.add-menu-item-tabs li {
+ padding: 8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .inline-edit-row fieldset {
- font-size: 12px;
- float: left;
- margin: 0;
- padding: 0;
- width: 100%;
</del><ins>+#post-body ul.category-tabs li.tabs,
+#post-body ul.add-menu-item-tabs li.tabs {
+ -moz-border-radius: 3px 0 0 3px;
+ -webkit-border-top-left-radius: 3px;
+ -webkit-border-bottom-left-radius: 3px;
+ -khtml-border-top-left-radius: 3px;
+ -khtml-border-bottom-left-radius: 3px;
+ border-top-left-radius: 3px;
+ border-bottom-left-radius: 3px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .inline-edit-row fieldset .inline-edit-col {
- padding: 0 0.5em;
</del><ins>+#post-body ul.category-tabs li.tabs a,
+#post-body ul.add-menu-item-tabs li.tabs a {
+ font-weight: bold;
+ text-decoration: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col {
- border-width: 0 0 0 1px;
- border-style: none none none solid;
</del><ins>+.categorydiv div.tabs-panel,
+.customlinkdiv div.tabs-panel,
+.posttypediv div.tabs-panel,
+.taxonomydiv div.tabs-panel,
+#linkcategorydiv div.tabs-panel {
+ height: 200px;
+ overflow: auto;
+ padding: 0.5em 0.9em;
+ border-style: solid;
+ border-width: 1px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .quick-edit-row-post .inline-edit-col-left {
- width: 40%;
</del><ins>+.nav-menus-php .customlinkdiv div.tabs-panel,
+.nav-menus-php .posttypediv div.tabs-panel,
+.nav-menus-php .taxonomydiv div.tabs-panel {
+ height: auto;
+ max-height: 205px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .quick-edit-row-post .inline-edit-col-right {
- width: 39%;
</del><ins>+div.tabs-panel-active {
+ display:block;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .inline-edit-row-post .inline-edit-col-center {
- width: 20%;
</del><ins>+div.tabs-panel-inactive {
+ display:none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .quick-edit-row-page .inline-edit-col-left {
- width: 50%;
</del><ins>+#post-body .categorydiv div.tabs-panel,
+.taxonomy div.tabs-panel,
+#post-body #linkcategorydiv div.tabs-panel {
+ margin: 0 5px 0 125px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .quick-edit-row-page .inline-edit-col-right,
-#wpbody-content .bulk-edit-row-post .inline-edit-col-right {
- width: 49%;
</del><ins>+#side-sortables .category-tabs li,
+#side-sortables .add-menu-item-tabs li {
+ display: inline;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .bulk-edit-row .inline-edit-col-left {
- width: 30%;
</del><ins>+#side-sortables .category-tabs a,
+#side-sortables .add-menu-item-tabs a {
+ text-decoration: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .bulk-edit-row-page .inline-edit-col-right {
- width: 69%;
</del><ins>+#side-sortables .category-tabs,
+#side-sortables .add-menu-item-tabs {
+ margin-bottom: 3px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .bulk-edit-row .inline-edit-col-bottom {
- float: right;
- width: 69%;
</del><ins>+.categorydiv ul,
+.customlinkdiv ul,
+.posttypediv ul,
+.taxonomydiv ul,
+#linkcategorydiv ul {
+ list-style: none;
+ padding: 0;
+ margin: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .inline-edit-row-page .inline-edit-col-right,
-#owpbody-content .bulk-edit-row-post .inline-edit-col-right {
- margin-top: 27px;
</del><ins>+#front-page-warning,
+#front-static-pages ul,
+.inline-editor ul.cat-checklist ul,
+.categorydiv ul.categorychecklist ul,
+.customlinkdiv ul.categorychecklist ul,
+.posttypediv ul.categorychecklist ul,
+.taxonomydiv ul.categorychecklist ul,
+#linkcategorydiv ul.categorychecklist ul {
+ margin-left: 18px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset .inline-edit-group {
- clear: both;
</del><ins>+ul.categorychecklist li {
+ margin: 0;
+ padding: 0;
+ line-height: 19px;
+ word-wrap: break-word;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset .inline-edit-group:after {
- content: ".";
- display: block;
- height: 0;
- clear: both;
- visibility: hidden;
</del><ins>+.category-adder h4 {
+ margin-top: 4px;
+ margin-bottom: 0px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row p.submit {
- clear: both;
- padding: 0.5em;
- margin: 0.5em 0 0;
</del><ins>+.categorydiv .tabs-panel,
+.customlinkdiv .tabs-panel,
+.posttypediv .tabs-panel,
+.taxonomydiv .tabs-panel {
+ border-width: 3px;
+ border-style: solid;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row span.error {
- line-height: 22px;
- margin: 0 15px;
- padding: 3px 5px;
</del><ins>+ul.category-tabs,
+ul.add-menu-item-tabs {
+ margin-top: 12px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* Positioning */
-.inline-edit-row h4 {
- margin: .2em 0;
- padding: 0;
- line-height: 23px;
</del><ins>+ul.category-tabs li.tabs,
+ul.add-menu-item-tabs li.tabs {
+ border-style: solid solid none;
+ border-width: 1px 1px 0;
</ins><span class="cx"> }
</span><del>-.inline-edit-row fieldset span.title,
-.inline-edit-row fieldset span.checkbox-title {
- margin: 0;
- padding: 0;
- line-height: 27px;
-}
</del><span class="cx">
</span><del>-.inline-edit-row fieldset label,
-.inline-edit-row fieldset span.inline-edit-categories-label {
- display: block;
- margin: .2em 0;
</del><ins>+#post-body .category-tabs li.tabs,
+#post-body .add-menu-item-tabs li.tabs {
+ border-style: solid none solid solid;
+ border-width: 1px 0 1px 1px;
+ margin-right: -1px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset label.inline-edit-tags {
- margin-top: 0;
</del><ins>+ul.category-tabs li,
+ul.add-menu-item-tabs li {
+ padding: 5px;
+ -moz-border-radius: 3px 3px 0 0;
+ -webkit-border-top-left-radius: 3px;
+ -webkit-border-top-right-radius: 3px;
+ -khtml-border-top-left-radius: 3px;
+ -khtml-border-top-right-radius: 3px;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset label.inline-edit-tags span.title {
- margin: .2em 0;
</del><ins>+.form-wrap {
+ margin: 10px 0;
+ width: 97%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset label span.title {
- display: block;
- float: left;
- width: 5em;
</del><ins>+.form-wrap p,
+.form-wrap label {
+ font-size: 11px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset label span.input-text-wrap {
</del><ins>+.form-wrap label {
</ins><span class="cx"> display: block;
</span><del>- margin-left: 5em;
</del><ins>+ padding: 2px;
+ font-size: 12px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.quick-edit-row-post fieldset.inline-edit-col-right label span.title {
- width: auto;
- padding-right: 0.5em;
</del><ins>+.form-field input,
+.form-field textarea {
+ border-style: solid;
+ border-width: 1px;
+ width: 95%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row .input-text-wrap input[type=text] {
- width: 100%;
</del><ins>+p.description,
+.form-wrap p {
+ margin: 2px 0 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset label input[type=checkbox] {
- vertical-align: text-bottom;
</del><ins>+p.help,
+p.description,
+span.description,
+.form-wrap p {
+ font-size: 12px;
+ font-style: italic;
+ font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset label textarea {
- width: 100%;
- height: 4em;
</del><ins>+.form-wrap .form-field {
+ margin: 0 0 10px;
+ padding: 8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .bulk-edit-row fieldset .inline-edit-group label {
- max-width: 50%;
</del><ins>+.col-wrap h3 {
+ margin: 12px 0;
+ font-size: 1.1em;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child {
- margin-right: 0.5em
</del><ins>+.col-wrap p.submit {
+ margin-top: -10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* Styling */
-.inline-edit-row h4 {
- text-transform: uppercase;
-}
</del><span class="cx">
</span><del>-.inline-edit-row fieldset span.title,
-.inline-edit-row fieldset span.checkbox-title {
- font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
- font-style: italic;
- line-height: 1.8em;
-}
</del><ins>+/*------------------------------------------------------------------------------
+ 13.0 - Tags
+------------------------------------------------------------------------------*/
</ins><span class="cx">
</span><del>-/* Specific Elements */
-.inline-edit-row fieldset input[type="text"],
-.inline-edit-row fieldset textarea {
- border-style: solid;
- border-width: 1px;
</del><ins>+.taghint {
+ color: #aaa;
+ margin: 15px 0 -24px 12px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset .inline-edit-date {
- float: left;
</del><ins>+#poststuff .tagsdiv .howto {
+ margin: 0 0 6px 8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset input[name=jj],
-.inline-edit-row fieldset input[name=hh],
-.inline-edit-row fieldset input[name=mn] {
- font-size: 12px;
- width: 2.1em;
</del><ins>+.ajaxtag .newtag {
+ background: transparent;
+ position: relative;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset input[name=aa] {
- font-size: 12px;
- width: 3.5em;
</del><ins>+.tagsdiv .newtag {
+ width: 180px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset label input.inline-edit-password-input {
- width: 8em;
</del><ins>+.tagsdiv .the-tags {
+ display: block;
+ height: 60px;
+ margin: 0 auto;
+ overflow: auto;
+ width: 260px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row .catshow,
-.inline-edit-row .cathide {
- cursor: pointer;
</del><ins>+#post-body-content .tagsdiv .the-tags {
+ margin: 0 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ul.cat-checklist {
- height: 12em;
</del><ins>+p.popular-tags {
+ -moz-border-radius: 8px;
+ -khtml-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ border-radius: 8px;
+ border-width: 1px;
</ins><span class="cx"> border-style: solid;
</span><del>- border-width: 1px;
- overflow-y: scroll;
- padding: 0 5px;
- margin: 0;
</del><ins>+ line-height: 2em;
+ padding: 8px 12px 12px;
+ text-align: justify;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#bulk-titles {
- display: block;
- height: 12em;
- border-style: solid;
- border-width: 1px;
- overflow-y: scroll;
- padding: 0 5px;
- margin: 0 0 5px;
</del><ins>+p.popular-tags a {
+ padding: 0 3px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset ul.cat-checklist li,
-.inline-edit-row fieldset ul.cat-checklist input {
- margin: 0;
</del><ins>+.tagcloud {
+ width: 97%;
+ margin: 0 0 40px;
+ text-align: justify;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/* TODO: Review this was a conflict - PJW */
+.tagcloud h3 {
+ margin: 2px 0 12px;
+}
+
</ins><span class="cx"> .inline-edit-row fieldset ul.cat-checklist label,
</span><span class="cx"> .inline-edit-row .catshow,
</span><span class="cx"> .inline-edit-row .cathide,
</span><span class="lines">@@ -2873,46 +2769,38 @@
</span><span class="cx"> font-style: normal;
</span><span class="cx"> font-size: 11px;
</span><span class="cx"> }
</span><ins>+/* END */
</ins><span class="cx">
</span><del>-table .inline-edit-row fieldset ul.cat-hover {
- height: auto;
- max-height: 30em;
- overflow-y: auto;
</del><ins>+.ac_results {
+ padding: 0;
+ margin: 0;
+ list-style: none;
</ins><span class="cx"> position: absolute;
</span><ins>+ z-index: 10000;
+ display: none;
+ border-width: 1px;
+ border-style: solid;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset label input.inline-edit-menu-order-input {
- width: 3em;
</del><ins>+.ac_results li {
+ padding: 2px 5px;
+ white-space: nowrap;
+ text-align: left;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inline-edit-row fieldset label input.inline-edit-slug-input {
- width: 75%;
</del><ins>+.ac_over {
+ cursor: pointer;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.quick-edit-row-post fieldset label.inline-edit-status {
- float: left;
</del><ins>+.ac_match {
+ text-decoration: underline;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#bulk-titles {
- line-height: 140%;
-}
-#bulk-titles div {
- margin: 0.2em 0.3em;
-}
</del><span class="cx">
</span><del>-#bulk-titles div a {
- cursor: pointer;
- display: block;
- float: left;
- height: 10px;
- margin: 3px 3px 0 -2px;
- overflow: hidden;
- position: relative;
- text-indent: -9999px;
- width: 10px;
-}
</del><ins>+/*------------------------------------------------------------------------------
+ 14.0 - Media Screen
+------------------------------------------------------------------------------*/
</ins><span class="cx">
</span><del>-/* Media library */
</del><span class="cx"> #wpbody-content #media-items .describe {
</span><span class="cx"> border-collapse: collapse;
</span><span class="cx"> width: 100%;
</span><span class="lines">@@ -3084,7 +2972,11 @@
</span><span class="cx"> width: 25%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* find posts */
</del><ins>+
+/*------------------------------------------------------------------------------
+ 14.1 - Media Uploader
+------------------------------------------------------------------------------*/
+
</ins><span class="cx"> .find-box {
</span><span class="cx"> width: 500px;
</span><span class="cx"> height: 300px;
</span><span class="lines">@@ -3146,6 +3038,8 @@
</span><span class="cx"> bottom: 1px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+<<<<<<< .mine
+=======
</ins><span class="cx"> /* favorite-actions */
</span><span class="cx"> #favorite-actions {
</span><span class="cx"> float: right;
</span><span class="lines">@@ -3248,216 +3142,17 @@
</span><span class="cx"> line-height: 2px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* TODO: Review this was a conflict - PJW */
</ins><span class="cx"> .swfupload {
</span><span class="cx"> margin: 5px 10px;
</span><span class="cx"> vertical-align: middle;
</span><span class="cx"> }
</span><ins>+/* END */
</ins><span class="cx">
</span><del>-/* table.fixed column width */
-table.fixed {
- table-layout: fixed;
-}
</del><ins>+/*------------------------------------------------------------------------------
+ 14.2 - Image Editor
+------------------------------------------------------------------------------*/
</ins><span class="cx">
</span><del>-.fixed .column-rating,
-.fixed .column-visible {
- width: 8%;
-}
-
-.fixed .column-date,
-.fixed .column-parent,
-.fixed .column-links {
- width: 10%;
-}
-
-.fixed .column-response,
-.fixed .column-author,
-.fixed .column-categories,
-.fixed .column-tags,
-.fixed .column-rel,
-.fixed .column-role {
- width: 15%;
-}
-
-.fixed .column-comments {
- width: 4em;
- padding: 8px 0;
- text-align: left;
-}
-.fixed .column-comments .vers {
- padding-left: 3px;
-}
-.fixed .column-comments a {
- float: left;
-}
-
-.fixed .column-slug {
- width: 25%;
-}
-
-.fixed .column-posts {
- width: 10%;
-}
-
-.fixed .column-icon {
- width: 80px;
-}
-
-#commentsdiv .fixed .column-author,
-#comments-form .fixed .column-author {
- width: 20%;
-}
-
-.widefat th,
-.widefat td {
- overflow: hidden;
-}
-
-.widefat td p {
- margin: 2px 0 0.8em;
-}
-
-table .vers,
-table .column-visible,
-table .column-rating {
- text-align: center;
-}
-
-.sorting-indicator {
- display: none;
- float: left;
- width: 21px;
- height: 4px;
- margin-top: 5px;
-}
-th.sortable a, th.sorted-asc a, th.sorted-desc a {
- float: left;
-}
-th.sorted-asc .sorting-indicator, th.sorted-desc:hover .sorting-indicator, th.sortable:hover .sorting-indicator {
- display: block;
- background: url(../images/sort_asc.gif) no-repeat scroll 0 0;
-}
-th.sorted-desc .sorting-indicator, th.sorted-asc:hover .sorting-indicator {
- display: block;
- background: url(../images/sort_desc.gif) no-repeat scroll 0 0;
-}
-
-.icon32 {
- float: left;
- height: 36px;
- margin: 14px 6px 0 0;
- width: 36px;
-}
-
-.key-labels label {
- line-height: 24px;
-}
-
-.subtitle {
- font-size: 0.75em;
- line-height: 1;
- padding-left: 25px;
-}
-
-ol {
- list-style-type: decimal;
- margin-left: 2em;
-}
-
-.postbox-container {
- float: left;
- padding-right: 0.5%;
-}
-
-.postbox-container .meta-box-sortables {
- min-height: 300px;
-}
-
-.temp-border {
- border: 1px dotted #ccc;
-}
-
-.columns-prefs label {
- padding: 0 5px;
-}
-
-.theme-install-php h4,
-.plugin-install-php h4 {
- margin: 2.5em 0 8px;
-}
-
-p.install-help {
- margin: 8px 0;
- font-style: italic;
-}
-
-p.popular-tags {
- -moz-border-radius: 8px;
- -khtml-border-radius: 8px;
- -webkit-border-radius: 8px;
- border-radius: 8px;
- border-width: 1px;
- border-style: solid;
- line-height: 2em;
- padding: 8px 12px 12px;
- text-align: justify;
-}
-
-p.popular-tags a {
- padding: 0 3px;
-}
-
-.stuffbox .editcomment {
- clear: none;
-}
-
-.ajax-feedback {
- visibility: hidden;
- vertical-align: bottom;
-}
-
-.tagsdiv .newtag {
- width: 180px;
-}
-
-.tagsdiv .the-tags {
- display: block;
- height: 60px;
- margin: 0 auto;
- overflow: auto;
- width: 260px;
-}
-
-#post-body-content .tagsdiv .the-tags {
- margin: 0 5px;
-}
-
-label,
-#your-profile label + a {
- vertical-align: middle;
-}
-
-#misc-publishing-actions label {
- vertical-align: baseline;
-}
-
-.plugin-update-tr .update-message {
- margin: 5px;
- padding: 3px 5px;
- border-width: 1px;
- border-style: solid;
- -moz-border-radius: 5px;
- -khtml-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
-}
-
-.add-new-h2 {
- font-style: normal;
- margin: 0 6px;
- position: relative;
- top: -3px;
-}
-
</del><span class="cx"> .describe .image-editor {
</span><span class="cx"> vertical-align: top;
</span><span class="cx"> }
</span><span class="lines">@@ -3690,14 +3385,183 @@
</span><span class="cx"> padding: 2px 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#dashboard_recent_comments div.undo {
- border-top-style: solid;
- border-top-width: 1px;
- margin: 0 -10px;
- padding: 3px 8px;
</del><ins>+
+/*------------------------------------------------------------------------------
+ 15.0 - Comments Screen
+------------------------------------------------------------------------------*/
+
+.form-table {
+ border-collapse: collapse;
+ margin-top: 0.5em;
+ width: 100%;
+ margin-bottom: -8px;
+ clear: both;
+}
+
+.form-table td {
+ margin-bottom: 9px;
+ padding: 8px 10px;
+ line-height: 20px;
</ins><span class="cx"> font-size: 11px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.form-table th,
+.form-wrap label {
+ font-weight: normal;
+ text-shadow: rgba(255,255,255,1) 0 1px 0;
+}
+
+.form-table th {
+ vertical-align: top;
+ text-align: left;
+ padding: 10px;
+ width: 200px;
+}
+
+.form-table th.th-full {
+ width: auto;
+}
+
+.form-table div.color-option {
+ display: block;
+ clear: both;
+ margin-top: 12px;
+}
+
+.form-table input.tog {
+ margin-top: 2px;
+ margin-right: 2px;
+ float: left;
+}
+
+.form-table table.color-palette {
+ vertical-align: bottom;
+ float: left;
+ margin: -12px 3px 11px;
+}
+
+.form-table .color-palette td {
+ border-width: 1px 1px 0;
+ border-style: solid solid none;
+ height: 10px;
+ line-height: 20px;
+ width: 10px;
+}
+
+.commentlist li {
+ padding: 1em 1em .2em;
+ margin: 0;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+}
+
+.commentlist li li {
+ border-bottom: 0;
+ padding: 0;
+}
+
+.commentlist p {
+ padding: 0;
+ margin: 0 0 .8em;
+}
+
+/* reply to comments */
+#replyrow {
+ font-size: 11px;
+}
+
+#replyrow input {
+ border-width: 1px;
+ border-style: solid;
+}
+
+#replyrow td {
+ padding: 2px;
+}
+
+#replyrow #editorcontainer {
+ border: 0 none;
+}
+
+#replysubmit {
+ margin: 0;
+ padding: 3px 7px;
+}
+
+#replysubmit img.waiting,
+.inline-edit-save img.waiting {
+ padding: 4px 10px 0;
+ vertical-align: top;
+ float: right;
+}
+
+#replysubmit .button {
+ margin-right: 5px;
+}
+
+#replyrow #editor-toolbar {
+ display: none;
+}
+
+#replyhead {
+ font-size: 12px;
+ font-weight: bold;
+ padding: 2px 10px 4px;
+}
+
+#edithead .inside {
+ float: left;
+ padding: 3px 0 2px 5px;
+ margin: 0;
+ text-align: center;
+ font-size: 11px;
+}
+
+#edithead .inside input {
+ width: 180px;
+ font-size: 11px;
+}
+
+#edithead label {
+ padding: 2px 0;
+}
+
+#replycontainer {
+ padding: 5px;
+ border: 0 none;
+ height: 120px;
+ overflow: hidden;
+ position: relative;
+}
+
+#replycontent {
+ resize: none;
+ margin: 0;
+ width: 100%;
+ height: 100%;
+ padding: 0;
+ line-height: 150%;
+ border: 0 none;
+ outline: none;
+ font-size: 12px;
+}
+
+#replyrow #ed_reply_toolbar {
+ margin: 0;
+ padding: 2px 3px;
+}
+
+.comment-ays {
+ margin-bottom: 0;
+ border-style: solid;
+ border-width: 1px;
+}
+
+.comment-ays th {
+ border-right-style: solid;
+ border-right-width: 1px;
+}
+
</ins><span class="cx"> .trash-undo-inside,
</span><span class="cx"> .spam-undo-inside {
</span><span class="cx"> margin: 1px 8px 1px 0;
</span><span class="lines">@@ -3712,60 +3576,149 @@
</span><span class="cx"> vertical-align: middle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* tag hints */
-.taghint {
- color: #aaa;
- margin: 15px 0 -24px 12px;
</del><ins>+.stuffbox .editcomment {
+ clear: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#poststuff .tagsdiv .howto {
- margin: 0 0 6px 8px;
</del><ins>+#comment-status-radio p {
+ margin: 3px 0 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.ajaxtag .newtag {
- background: transparent;
- position: relative;
</del><ins>+#comment-status-radio input {
+ margin: 2px 3px 5px 0;
+ vertical-align: middle;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#broken-themes {
</del><ins>+#comment-status-radio label {
+ padding: 5px 0;
+}
+
+.commentlist .avatar {
+ vertical-align: text-top;
+}
+
+
+/*------------------------------------------------------------------------------
+ 16.0 - Themes
+------------------------------------------------------------------------------*/
+
+table#availablethemes {
+ border-spacing: 0;
+ border-width: 1px 0;
+ border-style: solid none;
+ margin: 10px auto;
+ width: 100%;
+}
+
+td.available-theme {
+ vertical-align: top;
+ width: 240px;
+ margin: 0;
+ padding: 20px;
</ins><span class="cx"> text-align: left;
</span><del>- width: 50%;
- border-spacing: 3px;
- padding: 3px;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-.describe .del-link {
- padding-left: 5px;
</del><ins>+table#availablethemes td {
+ border-width: 0 1px 1px;
+ border-style: none solid solid;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.comment-ays {
- margin-bottom: 0;
</del><ins>+table#availablethemes td.right,
+table#availablethemes td.left {
+ border-right: 0 none;
+ border-left: 0 none;
+}
+
+table#availablethemes td.bottom {
+ border-bottom: 0 none;
+}
+
+.available-theme a.screenshot {
+ width: 240px;
+ height: 180px;
+ display: block;
+ border-width: 1px;
</ins><span class="cx"> border-style: solid;
</span><ins>+ margin-bottom: 10px;
+ overflow: hidden;
+}
+
+.available-theme img {
+ width: 240px;
+}
+
+.available-theme h3 {
+ margin: 15px 0 5px;
+}
+
+#current-theme {
+ margin: 1em 0 1.5em;
+}
+
+#current-theme a {
+ border-bottom: none;
+}
+
+#current-theme h3 {
+ font-size: 17px;
+ font-weight: normal;
+ margin: 0;
+}
+
+#current-theme .theme-description {
+ margin-top: 5px;
+}
+
+#current-theme img {
+ float: left;
</ins><span class="cx"> border-width: 1px;
</span><ins>+ border-style: solid;
+ margin-right: 1em;
+ margin-bottom: 1.5em;
+ width: 150px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.comment-ays th {
- border-right-style: solid;
- border-right-width: 1px;
</del><ins>+.theme-options span {
+ text-transform: uppercase;
+ font-size: 13px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* Custom Background */
</del><ins>+.theme-options a {
+ font-size: 15px;
+}
</ins><span class="cx">
</span><del>-div#custom-background-image {
- min-height: 100px;
- border: 1px solid #dfdfdf;
</del><ins>+#TB_window #TB_title a.tb-theme-preview-link,
+#TB_window #TB_title a.tb-theme-preview-link:visited {
+ font-weight: bold;
+ text-decoration: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-div#custom-background-image img {
- max-width: 400px;
- max-height: 300px;
</del><ins>+#TB_window #TB_title {
+ background-color: #222;
+ color: #cfcfcf;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#custom-background label {
- padding-right: 15px;
</del><ins>+.themes-php .wrap h2, .theme-install-php .wrap h2 {
+ border-bottom: 1px solid #ccc;
+ padding-bottom: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* Custom Header */
</del><ins>+#broken-themes {
+ text-align: left;
+ width: 50%;
+ border-spacing: 3px;
+ padding: 3px;
+}
+
+.theme-install-php h4 {
+ margin: 2.5em 0 8px;
+}
+
+
+/*------------------------------------------------------------------------------
+ 16.1 - Custom Header Screen
+------------------------------------------------------------------------------*/
+
</ins><span class="cx"> .appearance_page_custom-header #headimg {
</span><span class="cx"> border: 1px solid #DFDFDF;
</span><span class="cx"> min-height: 100px;
</span><span class="lines">@@ -3789,8 +3742,30 @@
</span><span class="cx"> vertical-align: middle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* Tab Interface */
</del><span class="cx">
</span><ins>+/*------------------------------------------------------------------------------
+ 16.2 - Custom Background Screen
+------------------------------------------------------------------------------*/
+
+div#custom-background-image {
+ min-height: 100px;
+ border: 1px solid #dfdfdf;
+}
+
+div#custom-background-image img {
+ max-width: 400px;
+ max-height: 300px;
+}
+
+#custom-background label {
+ padding-right: 15px;
+}
+
+
+/*------------------------------------------------------------------------------
+ 16.3 - Tabbed Admin Screen Interface (Experimental)
+------------------------------------------------------------------------------*/
+
</ins><span class="cx"> .nav-tab {
</span><span class="cx"> border-style: solid;
</span><span class="cx"> border-color: #ccc #ccc #f9f9f9;
</span><span class="lines">@@ -3817,6 +3792,7 @@
</span><span class="cx"> color: #464646;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* TODO: Review this was a conflict - PJW */
</ins><span class="cx"> h2.nav-tab-wrapper, h3.nav-tab-wrapper {
</span><span class="cx"> border-bottom: 1px solid #ccc;
</span><span class="cx"> padding-bottom: 0;
</span><span class="lines">@@ -3826,8 +3802,548 @@
</span><span class="cx"> padding: 4px 20px 6px;
</span><span class="cx"> font: italic normal normal 24px/35px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
</span><span class="cx"> }
</span><ins>+/* END */
</ins><span class="cx">
</span><ins>+/*------------------------------------------------------------------------------
+ 17.0 - Plugins
+------------------------------------------------------------------------------*/
+
+.plugins #name {width: 33%}
+
+.plugins .name,
+#pass-strength-result.strong,
+#pass-strength-result.short,
+.button-highlighted,
+input.button-highlighted,
+#quicktags #ed_strong,
+#ed_reply_toolbar #ed_reply_strong {
+ font-weight: bold;
+}
+
+.plugins p {
+ margin: 0 4px;
+ padding: 0;
+}
+
+.plugins .desc p {
+ margin: 0 0 8px;
+}
+
+.plugins td.desc {
+ line-height: 1.5em;
+}
+
+.plugins .desc ul,
+.plugins .desc ol {
+ margin: 0 0 0 2em;
+}
+
+.plugins .desc ul {
+ list-style-type: disc;
+}
+
+.plugins .action-links {
+ white-space: nowrap;
+}
+
+.plugins .row-actions-visible {
+ padding: 0;
+}
+
+.plugins tbody th.check-column {
+ padding: 7px 0;
+}
+
+.plugins td, .plugins th {
+ border-bottom: 0 none;
+}
+
+#install-plugins .plugins td,
+#install-plugins .plugins th {
+ border-bottom-style: solid;
+ border-bottom-width: 1px;
+}
+
+.plugins .inactive td,
+.plugins .inactive th,
+.plugins .active td,
+.plugins .active th {
+ border-top-style: solid;
+ border-top-width: 1px;
+ padding: 5px 7px 0;
+}
+
+#wpbody-content .plugins .plugin-title {
+ padding-right: 12px;
+}
+
+.plugins .second td,
+.plugins .second th {
+ border-top: 0 none;
+ padding: 0 7px 5px;
+}
+
+.plugins-php .widefat tfoot th,
+.plugins-php .widefat tfoot td {
+ border-top-style: solid;
+ border-top-width: 1px;
+}
+
+.plugin-update-tr .update-message {
+ margin: 5px;
+ padding: 3px 5px;
+ border-width: 1px;
+ border-style: solid;
+ -moz-border-radius: 5px;
+ -khtml-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+}
+
+.plugin-install-php h4 {
+ margin: 2.5em 0 8px;
+}
+
+
+/*------------------------------------------------------------------------------
+ 18.0 - Users
+------------------------------------------------------------------------------*/
+
+#profile-page .form-table textarea {
+ width: 500px;
+ margin-bottom: 6px;
+}
+
+#profile-page .form-table #rich_editing {
+ margin-right: 5px
+}
+
+#your-profile legend {
+ font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+ font-size: 22px;
+}
+
+#your-profile #rich_editing {
+ border: none;
+}
+
+#display_name {
+ width: 15em;
+}
+
+
+/*------------------------------------------------------------------------------
+ 19.0 - Tools
+------------------------------------------------------------------------------*/
+
+
+
+
+/*------------------------------------------------------------------------------
+ 20.0 - Settings
+------------------------------------------------------------------------------*/
+
+#utc-time, #local-time {
+ padding-left: 25px;
+ font-style: italic;
+ font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+}
+
+.defaultavatarpicker .avatar {
+ margin: 2px 0;
+ vertical-align: middle;
+}
+
+
+/*------------------------------------------------------------------------------
+ 21.0 - Admin Footer
+------------------------------------------------------------------------------*/
+
+#footer {
+ margin-top: -46px;
+ border-top: 1px;
+ border-style: solid;
+}
+
+#footer,
+#footer a {
+ font-size: 12px;
+ font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+ font-style: italic;
+}
+
+#footer p {
+ margin: 0;
+ padding: 15px;
+ line-height: 15px;
+}
+
+#footer a {
+ text-decoration: none;
+}
+
+#footer a:hover {
+ text-decoration: underline;
+}
+
+
+/*------------------------------------------------------------------------------
+ 22.0 - Misc
+------------------------------------------------------------------------------*/
+
+#excerpt, .attachmentlinks {
+ margin: 0;
+ height: 4em;
+ width: 98%;
+}
+
+#template div {
+ margin-right: 190px;
+}
+
+p.pagenav {
+ margin: 0;
+ display: inline;
+}
+
+.pagenav span {
+ font-weight: bold;
+ margin: 0 6px;
+}
+
+.row-title {
+ font-size: 12px !important;
+ font-weight: bold;
+}
+
+.column-author img, .column-username img {
+ float: left;
+ margin-right: 10px;
+ margin-top: 3px;
+}
+
+.row-actions {
+ visibility: hidden;
+ padding: 2px 0 0;
+}
+
+tr:hover .row-actions,
+div.comment-item:hover .row-actions {
+ visibility: visible;
+}
+
+.row-actions-visible {
+ padding: 2px 0 0;
+}
+
+.form-table .pre {
+ padding: 8px;
+ margin: 0;
+}
+
+table.form-table td .updated {
+ font-size: 13px;
+}
+
+
+.tagchecklist {
+ margin-left: 14px;
+ font-size: 12px;
+ overflow: auto;
+}
+.tagchecklist strong {
+ margin-left: -8px;
+ position: absolute;
+}
+.tagchecklist span {
+ margin-right: 25px;
+ display: block;
+ float: left;
+ font-size: 11px;
+ line-height: 1.8em;
+ white-space: nowrap;
+ cursor: default;
+}
+.tagchecklist span a {
+ margin: 6px 0pt 0pt -9px;
+ cursor: pointer;
+ width: 10px;
+ height: 10px;
+ display: block;
+ float: left;
+ text-indent: -9999px;
+ overflow: hidden;
+ position: absolute;
+}
+
+
+#poststuff h2 {
+ margin-top: 20px;
+ font-size: 1.5em;
+ margin-bottom: 15px;
+ padding: 0 0 3px;
+ clear: left;
+}
+#poststuff h3,
+.metabox-holder h3 {
+ font-size: 12px;
+ font-weight: bold;
+ padding: 7px 9px;
+ margin: 0;
+ line-height: 1;
+}
+#poststuff .inside,
+#poststuff .inside p {
+ font-size: 11px;
+ margin: 6px 6px 8px;
+}
+#poststuff .inside .submitbox p {
+ margin: 1em 0;
+}
+#post-visibility-select {
+ line-height: 1.5em;
+ margin-top: 3px;
+}
+#poststuff #submitdiv .inside {
+ margin: 0;
+}
+#titlediv, #poststuff .postarea {
+ margin-bottom: 20px;
+}
+
+
+td.post-title strong, td.plugin-title strong {
+ display: block;
+ margin-bottom: .2em;
+}
+td.post-title p, td.plugin-title p {
+ margin: 6px 0;
+}
+td.plugin-title {
+ white-space: nowrap;
+}
+
+
+.wp-hidden-children .wp-hidden-child,
+.ui-tabs-hide {
+ display: none;
+}
+
+#templateside ul li a {
+ text-decoration: none;
+}
+
+
+.tool-box {
+ margin: 15px 0 35px;
+}
+.tool-box .buttons {
+ margin: 15px 0;
+}
+.tool-box .title {
+ margin: 8px 0;
+ font: 18px/24px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+}
+
+
+.pressthis a {
+ font-size: 1.2em;
+}
+
+
+#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-width: 1px;
+ border-top-style: solid;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+}
+#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;
+ -moz-border-radius: 4px 4px 0 0;
+ -webkit-border-top-left-radius: 4px;
+ -webkit-border-top-right-radius: 4px;
+ -khtml-border-top-left-radius: 4px;
+ -khtml-border-top-right-radius: 4px;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+ border-width: 1px;
+ border-style: solid;
+}
+#sidemenu li a .count-0 {
+ display: none;
+}
+
+#poststuff .inside .the-tagcloud {
+ margin: 5px 0 10px;
+ padding: 8px;
+ border-width: 1px;
+ border-style: solid;
+ line-height: 1.8em;
+ word-spacing: 3px;
+ -moz-border-radius: 6px;
+ -khtml-border-radius: 6px;
+ -webkit-border-radius: 6px;
+ border-radius: 6px;
+}
+
+table .vers,
+table .column-visible,
+table .column-rating {
+ text-align: center;
+}
+
</ins><span class="cx"> /* Scrollbar fix for bulk upgrade iframe */
</span><span class="cx"> body.update-php {
</span><span class="cx"> height: 98%;
</span><span class="cx"> }
</span><ins>+
+
+/*------------------------------------------------------------------------------
+ 23.0 - Dead
+------------------------------------------------------------------------------*/
+
+/* - Not used anywhere in WordPress - verify and then deprecate
+------------------------------------------------------------------------------*/
+.anchors {
+ margin: 10px 20px 10px 20px;
+}
+div.nav {
+ height: 2em;
+ padding: 7px 10px;
+ vertical-align: text-top;
+ margin: 5px 0;
+}
+.nav .button-secondary {
+ padding: 2px 4px;
+}
+* html #themeselect {
+ padding: 0 3px;
+ height: 22px;
+}
+.settings-toggle {
+ text-align: right;
+ margin: 5px 7px 15px 0;
+ font-size: 12px;
+}
+.settings-toggle h3 {
+ margin: 0;
+}
+form#tags-filter {
+ position: relative;
+}
+
+/* - Only used once or twice in all of WP - deprecate for global style
+------------------------------------------------------------------------------*/
+td.media-icon {
+ text-align: center;
+ width: 80px;
+ padding-top: 8px;
+ padding-bottom: 8px;
+}
+
+td.media-icon img {
+ max-width: 80px;
+ max-height: 60px;
+}
+.screen-per-page {
+ width: 3em;
+}
+* html #template div {margin-right: 0;}
+#save {width: 15em;}
+#loading-items {
+ position: absolute;
+ z-index: 9999;
+ padding: 10px;
+ background-color: #fff;
+ font-weight: bold;
+ text-align: center;
+ opacity: 0.5;
+}
+#howto {
+ font-size: 11px;
+ margin: 0 5px;
+ display: block;
+}
+.import-system {font-size: 16px;}
+#namediv table {
+ width: 100%;
+}
+#namediv td.first {
+ width: 10px;
+ white-space: nowrap;
+}
+#namediv input {
+ width: 98%;
+}
+#namediv p {
+ margin: 10px 0;
+}
+#submitdiv h3 {
+ margin-bottom: 0 !important;
+}
+
+/* - Used - but could/should be deprecated with a CSS reset
+------------------------------------------------------------------------------*/
+.zerosize {
+ height: 0;
+ width: 0;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ overflow: hidden;
+ position: absolute;
+}
+br.clear {
+ height: 2px;
+ line-height: 2px;
+}
+.checkbox {
+ border: none;
+ margin: 0;
+ padding: 0;
+}
+#content {
+ margin: 0;
+ width: 100%;
+}
+fieldset {
+ border: 0;
+ padding: 0;
+ margin: 0;
+}
+#linksubmitdiv div.inside,
+div.inside {
+ padding: 0;
+ margin: 0;
+}
+.post-categories {
+ display: inline;
+ margin: 0;
+ padding: 0;
+}
+.post-categories li {
+ display: inline;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>