WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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. 

git-svn-id: http://core.svn.wordpress.org/trunk@23507 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2013-02-28 15:40:44 +00:00
parent 9bd192fab3
commit 23e05a6301
5 changed files with 220 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
wp-admin/css/revisions.css
View File

@ -1,213 +0,0 @@
/* Styles for the revision screen */
.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;
}
#removed {
padding-left: 0px;
}
#removed {
color: #d2281f;
}
#added {
color: #00a100;
}
#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 #diffprevious, .comparetwo #diffnext {
display: none;
}
.comparetwo #diffslider {
width: 95%;
}
.currentversion span#diff_left_current_revision {
display: inline;
}
span#diff_left_current_revision, span#diff_from_current_revision {
display: none;
}
span#diff_left_count, span#diff_left_count_inner {
display: inline;
}
.currentversion span#diff_left_count,
.currentversion span#diff_left_count_inner,
.currentversion #difftitlefrom {
display: none;
}
#difftitlefrom {
float: left;
display: none;
}
.comparetwo #difftitlefrom, .comparetwo.currentversion span#diff_from_current_revision {
display: inline;
}
.comparetwo.currentversion #difftitlefrom {
display: none;
}
#modelsloading {
float: right;
line-height: 30px;
display: none;
clear: none;
margin: 0;
margin-top: -40px;
}
#modelsloading .spinner {
float: left;
}
.leftmodelloading #modelsloading,
.rightmodelloading #modelsloading,
.leftmodelloading #modelsloading .spinner,
.rightmodelloading #modelsloading .spinner {
display: inline;
}

0
wp-admin/css/revisions.min.css vendored
View File

235
wp-admin/css/wp-admin.css
View File

@ -3523,16 +3523,233 @@ table.diff tr {
background-color: transparent; background-color: transparent;
} }
table.diff td, table.diff th { table.diff td,
table.diff th {
padding: .5em; padding: .5em;
font-family: Consolas, Monaco, monospace; font-family: Consolas, Monaco, monospace;
border: none; border: none;
} }
table.diff .diff-deletedline del, table.diff .diff-addedline ins { table.diff .diff-deletedline del,
table.diff .diff-addedline ins {
text-decoration: none; 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;
}
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
11.3 - Featured Images 11.3 - Featured Images
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -8820,17 +9037,3 @@ a.widget-control-edit {
.locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap { .locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap {
margin-left: 8em; 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;
}

2
wp-admin/revision.php
View File

@ -73,7 +73,7 @@ if ( !empty($post->post_type) && 'post' != $post->post_type )
else else
$parent_file = $submenu_file = 'edit.php'; $parent_file = $submenu_file = 'edit.php';
wp_enqueue_style( 'revisions' ); wp_enqueue_style( 'wp-jquery-ui-slider' );
wp_enqueue_script( 'revisions' ); wp_enqueue_script( 'revisions' );
require_once( './admin-header.php' ); require_once( './admin-header.php' );

1
wp-includes/script-loader.php
View File

@ -543,7 +543,6 @@ function wp_default_styles( &$styles ) {
$styles->add( 'media-views', "/wp-includes/css/media-views$suffix.css", array( 'buttons' ) ); $styles->add( 'media-views', "/wp-includes/css/media-views$suffix.css", array( 'buttons' ) );
$styles->add( 'buttons', "/wp-includes/css/buttons$suffix.css" ); $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( '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 ) { foreach ( $rtl_styles as $rtl_style ) {
$styles->add_data( $rtl_style, 'rtl', true ); $styles->add_data( $rtl_style, 'rtl', true );