Ticket #24736: 24736-combined.2.diff

wp-admin/css/wp-admin.css

@@ -3500 +3500 @@
 /*------------------------------------------------------------------------------
   11.2 - Post Revisions
 ------------------------------------------------------------------------------*/
-body.revision-php {
-        overflow-y: scroll; /* Force a scrollbar, so centering doesn't jump */
-}
-
 .revisions-control-frame,
 .revisions-diff-frame {
         position: relative;
@@ -3522 +3518 @@
 
 .revisions-tickmarks {
         position: relative;
-        margin: 0 auto 0;
+        margin: 0 auto;
         height: 0.8em;
         z-index: 2;
         top: 7px;
         width: 70%;
         -moz-box-sizing: border-box;
         -webkit-box-sizing: border-box;
-        -ms-box-sizing: border-box; /* ie8 only */
         box-sizing: border-box;
 }
 
@@ -3542 +3537 @@
         border-width: 0 0 0 1px;
         -moz-box-sizing: border-box;
         -webkit-box-sizing: border-box;
-        -ms-box-sizing: border-box; /* ie8 only */
         box-sizing: border-box;
 }
 
-.revisions-tickmarks > div:first-of-type {
+.revisions-tickmarks > div:first-child {
         border-left-width: 0;
 }
 
@@ -3559 +3553 @@
         text-align: center;
         vertical-align: middle;
         opacity: 0;
+        filter: alpha(opacity=0);
         margin: 0 auto;
         width: 100%;
         height: 32px;
@@ -3569 +3564 @@
         -ms-transition:     opacity 0.5s;
         -o-transition:      opacity 0.5s;
         transition:         opacity 0.5s;
+        filter: alpha(opacity=0); /* ie8 and earlier */
 }
 
 .revisions.loading .loading-indicator {
         opacity: 1;
+        filter: alpha(opacity=100); /* ie8 and earlier */
 }
 
 .revisions .diff {
@@ -3585 +3582 @@
 
 .revisions.loading .diff {
         opacity: 0.5;
+        filter: alpha(opacity=50); /* ie8 and earlier */
 }
 
 .revisions-meta {
@@ -3612 +3610 @@
 
 .wp-slider {
         width: 70%;
-        margin: 0 auto 0;
+        margin: 0 auto;
         top: -3px;
 }
 

wp-admin/js/revisions.js

@@ -452 +452 @@
                 render: function() {
                         wp.Backbone.View.prototype.render.apply( this, arguments );
 
+                        $('html').css( 'overflow-y', 'scroll' );
                         $('#wpbody-content .wrap').append( this.el );
                         this.updateCompareTwoMode();
                         this.renderDiff( this.model.diff() );