Ticket #14770: 14770.2.diff

wp-admin/css/wp-admin.dev.css

@@ -5 +5 @@
 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
@@ -1245 +1231 @@
         border-top-left-radius: 6px;
 }
 
-/* TODO: Review this was a conflict - PJW */
 .postbox.closed h3 {
         -moz-border-radius-bottomleft: 4px;
         -webkit-border-bottom-left-radius: 4px;
@@ -1257 +1242 @@
         border-bottom-right-radius: 4px;
 }
 
-.form-table td p {
-        margin-top: 4px;
-}
-
-.form-table table.color-palette {
-        vertical-align: bottom;
-        float: left;
-        margin: -12px 3px 11px;
-}
-/* Conflict END */
-
 .postbox table.form-table {
         margin-bottom: 0;
 }
@@ -1454 +1428 @@
         border-radius: 5px;
 }
 
-/* TODO: Review this was a conflict - font-family - PJW */
 .tablenav .displaying-num {
         margin-right: 10px;
         font-size: 12px;
         font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
         font-style: italic;
-        font-family: Verdana, Arial, "Bitstream Vera Sans", sans-serif;
 }
 
 .tablenav .actions {
@@ -1642 +1614 @@
         margin-left: 5em;
 }
 
-/* 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;
 }
-.howto {
-        font-style: italic;
-        display: block;
-        font-family: Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-}
-/* END Conflict */
 
 .inline-edit-row .input-text-wrap input[type=text] {
         width: 100%;
@@ -1983 +1948 @@
         width: 99%;
 }
 
-/* TODO: Review this was a conflict - PJW */
 #normal-sortables .postbox .submit {
         background: transparent none;
         border: 0 none;
         float: right;
         padding: 0 12px;
+        margin:0;
 }
-/* END */
 
 #side-sortables .category-add input {
         width: 94%;
@@ -2098 +2062 @@
         margin: 0;
 }
 
-/* TODO: Review this was a conflict - PJW */
 #normal-sortables .postbox #replyrow .submit {
         float: none;
         margin: 0;
@@ -2125 +2088 @@
 ul.wp-tab-bar {
         margin-top: 12px;
 }
-/* END Conflict */
 
-/* TODO: Review this was a conflict - PJW */
 #side-sortables .comments-box thead th,
 #normal-sortables .comments-box thead th {
         background: transparent;
@@ -2145 +2106 @@
 #commentsdiv img.waiting {
         padding-left: 5px;
 }
-/* END Conflcit */
 
 #post-body .category-tabs li.tabs,
 #post-body .add-menu-item-tabs li.tabs {
@@ -2218 +2178 @@
         vertical-align: text-top;
 }
 
-/* TODO: Review this was a conflict - PJW */
-.defaultavatarpicker .avatar {
-        margin: 2px 0;
-        vertical-align: middle;
-}
-
 #post-body .tagsdiv #newtag {
         margin-right: 5px;
         width: 16em;
@@ -2429 +2383 @@
         text-decoration: none;
 }
 
-/* TODO: Review this was a conflict - PJW */
-#screen-options-link-wrap,
-#contextual-help-link-wrap {
-        float: right;
-        height: 22px;
-        padding: 0;
-        margin: 0 6px 0 0;
-        font-family: 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;
-}
-/* END */
 
 /*------------------------------------------------------------------------------
   12.0 - Categories
@@ -2454 +2393 @@
         padding: 4px 0;
 }
 
-/* TODO: Review this was a conflict - PJW */
 .category-adder h4 {
         margin: 0 0 8px;
 }
 
-/* END */
-
 #side-sortables .category-adder {
         margin: 0;
 }
@@ -2469 +2405 @@
         width: 30%;
 }
 
-/* TODO: Review this was a conflict - PJW */
-#side-sortables .category-add input {
-        width: 94%;
-}
-
-#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 4px 4px;
-        -webkit-border-radius: 0 0 4px 4px;
-        -khtml-border-radius: 0 0 4px 4px;
-        border-radius: 0 0 4px 4px;
-}
-/* END */
-
 #side-sortables .category-add select {
         width: 100%;
 }
@@ -2604 +2521 @@
         word-wrap: break-word;
 }
 
-.category-adder h4 {
-        margin-top: 4px;
-        margin-bottom: 0px;
-}
-
 .categorydiv .tabs-panel,
 .customlinkdiv .tabs-panel,
 .posttypediv .tabs-panel,
@@ -2755 +2667 @@
         text-align: justify;
 }
 
-/* TODO: Review this was a conflict - PJW */
 .tagcloud h3 {
         margin: 2px 0 12px;
 }
 
-.inline-edit-row fieldset ul.cat-checklist label,
-.inline-edit-row .catshow,
-.inline-edit-row .cathide,
-.inline-edit-row #bulk-titles div {
-        font-family: Verdana, Arial, "Bitstream Vera Sans", sans-serif;
-        font-style: normal;
-        font-size: 11px;
-}
-/* END */
-
 .ac_results {
         padding: 0;
         margin: 0;
@@ -3141 +3042 @@
         line-height: 2px;
 }
 
-/* TODO: Review this was a conflict - PJW */
 .swfupload {
         margin: 5px 10px;
         vertical-align: middle;
 }
-/* END */
 
+
 /*------------------------------------------------------------------------------
   14.2 - Image Editor
 ------------------------------------------------------------------------------*/
@@ -3433 +3333 @@
         float: left;
 }
 
+.form-table td p {
+        margin-top: 4px;
+}
+
 .form-table table.color-palette {
         vertical-align: bottom;
         float: left;
@@ -3697 +3601 @@
         color: #cfcfcf;
 }
 
-h2.nav-tab-wrapper, h3.nav-tab-wrapper {
-        border-bottom: 1px solid #ccc;
-        padding-bottom: 0;
-}
-
 #broken-themes {
         text-align: left;
         width: 50%;
@@ -3791 +3690 @@
         color: #464646;
 }
 
-/* TODO: Review this was a conflict - PJW */
 h2.nav-tab-wrapper, h3.nav-tab-wrapper {
         border-bottom: 1px solid #ccc;
         padding-bottom: 0;
@@ -3801 +3699 @@
         padding: 4px 20px 6px;
         font: italic normal normal 24px/35px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
 }
-/* END */
 
+
 /*------------------------------------------------------------------------------
   17.0 - Plugins
 ------------------------------------------------------------------------------*/