Changeset 23507

Timestamp:

02/28/2013 03:40:44 PM (12 years ago)

Author:

helen

Message:

Merge revisions.css into wp-admin.css. Move misplaced block of revisions CSS in wp-admin.css into appropriate section. Some standards clean up and selector merging. see #23497.

Location:

trunk

Files:

• wp-admin/css/revisions.css (deleted)
• wp-admin/css/revisions.min.css (deleted)
• wp-admin/css/wp-admin.css (modified) (3 diffs)
• wp-admin/revision.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -3524 +3524 @@
 }
 
-table.diff td, table.diff th {
+table.diff td,
+table.diff th {
     padding: .5em;
     font-family: Consolas, Monaco, monospace;
@@ -3530 +3531 @@
 }
 
-table.diff .diff-deletedline del, table.diff .diff-addedline ins {
+table.diff .diff-deletedline del,
+table.diff .diff-addedline ins {
     text-decoration: none;
 }
+
+#revisions-meta-mostrecent,
+#revisions-meta-stored,
+#revisions-meta-oldest,
+#revisions-meta-link {
+    line-height: 30px;
+    height: 30px;
+    vertical-align: middle;
+    padding-right: 10px;
+}
+
+#revisions-meta-mostrecent img,
+#revisions-meta-oldest img {
+    vertical-align: middle;
+}
+
+.revisiondiffcontainer {
+    width: 96%;
+}
+
+.revisiondiffcontainer input.button {
+    margin: 2px;
+}
+
+#diffrestore,
+#diffnext,
+#diffcancel {
+    float: right;
+    margin-right: 5px;
+}
+
+#diffprevious,
+#difftitle,
+#difftitlefrom,
+#diff_from_current_revision {
+    float: left;
+    margin-left: 5px;
+    height: 35px;
+}
+
+#diffprevious,
+#diffnext {
+    margin-top: 7px;
+    height: 30px;
+}
+
+#diffheader, #diffsubheader {
+    clear: both;
+    width: 100%;
+}
+
+#diffheader {
+    border-bottom: 2px solid #999;
+    width: 100%;
+    height: 45px;
+    line-height: 45px;
+    padding-top: 10px;
+}
+
+#diffsubheader {
+    background-color: #eee;
+    border-bottom: 2px solid #999;
+    width: 100%;
+    height:35px;
+    line-height: 35px;
+}
+
+#diffslider {
+    width: 70%;
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
+    height: 3.5em;
+}
+
+#revisioncount {
+    width: 50%;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 0;
+    line-height: 1em;
+    height: 1em;
+    text-align: center;
+    clear: none;
+    padding: 5px;
+}
+
+.revisiondiffcontainer {
+    margin-top: 10px;
+}
+
+#diffsliderwrap {
+    width: 80%;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+#diffsliderwrap #sliderinner {
+    position: relative;
+    top: 47px;
+}
+
+#removedandadded {
+    width: 100%;
+    padding-bottom: 30px;
+    padding-top: 3px;
+    font-size: 16px;
+}
+
+#removed,
+#added {
+    width: auto;
+    text-align: left;
+    padding-left: 5px;
+    padding-right: 5px;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    float: left;
+}
+
+.diffsplit #added {
+    float: right;
+    width: 47%;
+    text-align: left;
+}
+
+.diffsplit #removedandadded {
+    width: 100%;
+}
+
+#added {
+    padding-left: 10px;
+    color: #00a100;
+}
+
+#removed {
+    padding-left: 0px;
+    color: #d2281f;
+}
+
+#comparetworevisions {
+    float: right;
+    line-height: 35px;
+    padding-right: 5px;
+}
+
+#comparetworevisions input {
+    margin-right: 2px;
+}
+
+#difftitle img,
+#difftitlefrom img {
+    vertical-align: middle;
+    margin-left: 5px;
+}
+
+#showsplitviewoption,
+#toggleshowautosavesoption {
+    float: right;
+    padding-left: 10px;
+    padding-right: 10px;
+}
+
+#revisionoptions {
+    margin-top: 0px;
+    line-height: 40px;
+    clear: both;
+    width: 100%;
+}
+
+.comparetwo #diffslider {
+    width: 95%;
+}
+
+.comparetwo #diffprevious,
+.comparetwo #diffnext,
+span#diff_left_current_revision,
+span#diff_from_current_revision,
+.currentversion span#diff_left_count,
+.currentversion span#diff_left_count_inner,
+.currentversion #difftitlefrom,
+.comparetwo.currentversion #difftitlefrom {
+    display: none;
+}
+
+.currentversion span#diff_left_current_revision,
+span#diff_left_count,
+span#diff_left_count_inner,
+.comparetwo #difftitlefrom,
+.comparetwo.currentversion span#diff_from_current_revision,
+.leftmodelloading #modelsloading,
+.rightmodelloading #modelsloading,
+.leftmodelloading #modelsloading .spinner,
+.rightmodelloading #modelsloading .spinner {
+    display: inline;
+}
+
+#difftitlefrom {
+    float: left;
+    display: none;
+}
+
+#modelsloading {
+    float: right;
+    line-height: 30px;
+    display: none;
+    clear: none;
+    margin: 0;
+    margin-top: -40px;
+}
+
+#modelsloading .spinner {
+    float: left;
+ }
+
 
 /*------------------------------------------------------------------------------
@@ -8821 +9038 @@
     margin-left: 8em;
 }
-
-#revisions-meta-mostrecent, 
-#revisions-meta-stored,
-#revisions-meta-oldest,
-#revisions-meta-link {
-    line-height: 30px;
-    height: 30px;
-    vertical-align: middle;
-    padding-right: 10px;
-}
-#revisions-meta-mostrecent img, 
-#revisions-meta-oldest img {
-vertical-align: middle;
-}

trunk/wp-admin/revision.php

@@ -74 +74 @@
     $parent_file = $submenu_file = 'edit.php';
 
-wp_enqueue_style( 'revisions' );
+wp_enqueue_style( 'wp-jquery-ui-slider' );
 wp_enqueue_script( 'revisions' );
 

trunk/wp-includes/script-loader.php

@@ -544 +544 @@
     $styles->add( 'buttons', "/wp-includes/css/buttons$suffix.css" );
     $styles->add( 'wp-jquery-ui-slider', "/wp-includes/css/jquery-ui-slider$suffix.css" );
-    $styles->add( 'revisions', "/wp-admin/css/revisions$suffix.css", array( 'wp-jquery-ui-slider' ) );
 
     foreach ( $rtl_styles as $rtl_style ) {