From b7ebeea68525f98d9d1822c05ca5a73ed983475b Mon Sep 17 00:00:00 2001 From: "Dominik Schilling (ocean90)" Date: Fri, 5 Jul 2013 22:15:37 +0000 Subject: [PATCH] Revisions: CSS cleanup, see #24425. git-svn-id: https://develop.svn.wordpress.org/trunk@24574 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/css/colors-classic.css | 42 +--------- wp-admin/css/colors-fresh.css | 40 ---------- wp-admin/css/wp-admin-rtl.css | 15 +--- wp-admin/css/wp-admin.css | 135 +------------------------------- wp-admin/revision.php | 3 - 5 files changed, 7 insertions(+), 228 deletions(-) diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index fd2da2514b..bcac0ed7a8 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -1485,8 +1485,7 @@ table.diff .diff-addedline ins { border: 1px solid #d1e5ee; } -#diff-slider .ui-slider-tooltip, -#diff-slider-ticks .ui-slider-tooltip { +.diff-slider .ui-slider-tooltip { border-color: #d1e5ee; background-color: #fff; } @@ -1495,45 +1494,6 @@ table.diff .diff-addedline ins { color: #08a; } -.revision-tick.completed-false { - background-color: #99c; - background: url(../images/wpspin_light.gif) no-repeat; - background-position: middle; - background-size: 1px 10px; -} - -.revision-tick.completed-false { - background-image: none; -} - -.revision-tick.scope-of-changes-none { - background-color: #d1e5ee; -} - -.revision-tick.scope-of-changes-vsmall { - background-color: #b4d5e3; -} - -.revision-tick.scope-of-changes-small { - background-color: #98c5d9; -} - -.revision-tick.scope-of-changes-med { - background-color: #7bb4ce; -} - -.revision-tick.scope-of-changes-large { - background-color: #5ea4c4; -} - -.revision-tick.scope-of-changes-vlarge { - background-color: #4493b7; -} - -.diff-label { - color: #666; -} - /* jQuery UI Slider */ .wp-slider.ui-slider { border-color: #d1e5ee; diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index b92ab7a1aa..737c9d99cb 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -1379,7 +1379,6 @@ table.diff .diff-addedline ins { border: 1px solid #dfdfdf; } -.ui-slider-tooltip, .ui-slider-tooltip { border-color: #d7d7d7; background-color: #fff; @@ -1389,45 +1388,6 @@ table.diff .diff-addedline ins { color: #08a; } -.revision-tick.completed-false { - background-color: #99c; - background-image: url(../images/wpspin_light.gif) no-repeat; - background-position: middle; - background-size: 1px 10px; -} - -.revision-tick.completed-false { - background-image: none; -} - -.revision-tick.scope-of-changes-none { - background-color: #d7d7d7; -} - -.revision-tick.scope-of-changes-vsmall { - background-color: #c3c3c3; -} - -.revision-tick.scope-of-changes-small { - background-color: #b0b0b0; -} - -.revision-tick.scope-of-changes-med { - background-color: #9c9c9c; -} - -.revision-tick.scope-of-changes-large { - background-color: #898989; -} - -.revision-tick.scope-of-changes-vlarge { - background-color: #757575; -} - -.diff-label { - color: #666; -} - /* jQuery UI Slider */ .wp-slider.ui-slider { border-color: #d7d7d7; diff --git a/wp-admin/css/wp-admin-rtl.css b/wp-admin/css/wp-admin-rtl.css index 40428571a9..c4649baf23 100644 --- a/wp-admin/css/wp-admin-rtl.css +++ b/wp-admin/css/wp-admin-rtl.css @@ -954,22 +954,17 @@ th.sorted a span { /*------------------------------------------------------------------------------ 11.2 - Post Revisions ------------------------------------------------------------------------------*/ - -#diff-slider .ui-slider-tooltip, -#diff-slider-ticks .ui-slider-tooltip { - margin-left: 0; - margin-right: -78px; -} - .wp-slider .ui-slider-handle.left-handle:before, .wp-slider .ui-slider-handle.right-handle:before { height: 8px; width: 7px; } + .wp-slider .ui-slider-handle.left-handle:before { background-position: -5px -10px; left: 6px; } + .wp-slider .ui-slider-handle.right-handle:before { background-position: -4px -29px; left: 6px; @@ -1030,12 +1025,6 @@ th.sorted a span { margin-left: 5px; } -#diff-slider .ui-slider-tooltip, -#diff-slider-ticks .ui-slider-tooltip { - margin-left: 0; - margin-right: -78px; -} - /*------------------------------------------------------------------------------ 11.3 - Featured Images ------------------------------------------------------------------------------*/ diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css index e38d390729..ea145f0c67 100644 --- a/wp-admin/css/wp-admin.css +++ b/wp-admin/css/wp-admin.css @@ -3481,39 +3481,26 @@ td.plugin-title p { /*------------------------------------------------------------------------------ 11.2 - Post Revisions ------------------------------------------------------------------------------*/ -.revisions .spinner { - float: none; - margin: 100px auto; -} - -.revisions.loading .spinner { - display: block; -} - .revisions-control-frame, .revisions-diff-frame { position: relative; } .revisions-controls { - height: 60px; padding: 40px 0 20px; - border-bottom: none; margin-bottom: 10px; } -.comparing-two-revisions .revisions-controls { - height: 90px; -} - .revisions-meta { margin-top: 15px; } + .revision-toggle-compare-mode { position: absolute; top: 0; right: 0; } + .comparing-two-revisions .revisions-previous, .comparing-two-revisions .revisions-next { display: none; @@ -3574,34 +3561,9 @@ table.diff .diff-addedline ins { text-decoration: none; } -#revisions-diff { - position: relative; -} - -#loading-status { - display: none; - position: absolute; - top: 8px; - z-index: 1000; -} - -#loading-status .spinner { - display: inline-block; - float: none; - margin: -4px 0; -} - -#revision-interact { - padding: 20px 0; -} - -.comparetwo #diff-slider { - width: 95%; -} - .revisions .ui-slider-tooltip { position: absolute; - bottom: 86px; + bottom: 105px; margin-left: -70px; line-height: 28px; } @@ -3610,16 +3572,6 @@ table.diff .diff-addedline ins { display: inline; } -.comparing-two-revisions #diff-title-to strong { - display: inline; -} - -.diff-label { - margin: 20px 0 5px; - padding-left: 3px; - font-size: 13px; -} - #diff-header { -webkit-border-radius: 3px; border-radius: 3px; @@ -3653,94 +3605,15 @@ table.diff .diff-addedline ins { margin-left: 10px; } -#diff-table { - margin-top: 20px; -} - -#diff-previous-revision, -#diff-next-revision, #diff-header-from { display: none; } .comparing-two-revisions #diff-title-from, -.left-model-loading #loading-status, -.right-model-loading #loading-status, .comparing-two-revisions #diff-header-from { display: block; } -.comparing-two-revisions .revisions-tooltip div { - margin-bottom: 30px; -} -.diff-slider-ticks-wrapper { - margin: 0 auto; - text-align: left; -} - -#diff-slider-ticks { - position: absolute; - z-index: 2; - margin-top: 20px; -} - -.revision-tick { - width: 1px; - float: left; - margin: 1px 0 0 0; - height: .8em; - padding: 0; - margin-left: 0px; - cursor: pointer; -} - -#diff-slider-ticks .revision-tick:first-child { - border-bottom-left-radius: 3px; - border-top-left-radius: 3px; -} - -#diff-slider-ticks .revision-tick:last-child { - border-bottom-right-radius: 3px; - border-top-right-radius: 3px; -} - -.revision-tick.scope-of-changes-none { - width: 1px; -} - -.revision-tick.scope-of-changes-vsmall { - width: 2px; -} - -.revision-tick.scope-of-changes-small { - width: 3px; -} - -.revision-tick.scope-of-changes-med { - width: 4px; -} - -.revision-tick.scope-of-changes-large { - width: 5px; -} - -.revision-tick.scope-of-changes-vlarge { - width: 6px; -} - -.diff-loading { - margin-top: 50px; - width: 100%; - height: 200px; -} - -.diff-loading .spinner { - clear: both; - margin: 0 auto; - display: block; - float: none; -} - .ui-tooltip-content img, .ui-slider-tooltip img { float: left; @@ -3785,7 +3658,7 @@ body .ui-slider-tooltip { position: absolute; left: 0; margin-left: -35px; - bottom: 71px; + bottom: 90px; z-index: 10000; } diff --git a/wp-admin/revision.php b/wp-admin/revision.php index 036a116741..d632e73460 100644 --- a/wp-admin/revision.php +++ b/wp-admin/revision.php @@ -11,9 +11,6 @@ require_once('./admin.php'); require ABSPATH . 'wp-admin/includes/revision.php'; -// wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) -// wp_prepare_revisions_for_js( $post ) - wp_reset_vars( array( 'revision', 'action' ) ); $revision_id = absint( $revision );