Ticket #25144: 25144.diff

wp-content/themes/twentyfourteen/js/theme.js

@@ -103 +103 @@
 
                 } ).resize();
 
-                // Sticky header.
-                var $mastheadOffset  = -1,
-                        $toolbarOffset = $( 'body' ).is( '.admin-bar' ) ? 32 : 0,
-                        $maindiv = $( '#main' );
-
-                $( window ).on( 'scroll', false, function() {
-                        if ( $mastheadOffset < 0 )
-                                $mastheadOffset = $masthead.offset().top - $toolbarOffset;
-
-                        if ( ( window.scrollY > $mastheadOffset ) && ( $( window ).width() > 769 ) ) {
-                                $masthead.addClass( 'masthead-fixed' );
-                                $maindiv.css( {
-                                        marginTop: $masthead.height()
-                                } );
-                        } else {
-                                $masthead.removeClass( 'masthead-fixed' );
-                                $maindiv.css( {
-                                        marginTop: 0
-                                } );
-                        }
-                } );
-
                 // Arranges footer widgets vertically.
                 if ( $.isFunction( $.fn.masonry ) ) {
 

wp-content/themes/twentyfourteen/style.css

@@ -582 +582 @@
         width: 100%;
         z-index: 3;
 }
-
-/* Fixed Header */
-.site-header.masthead-fixed {
-        box-shadow: 0 1px 8px rgba(0, 0, 0, 0.2);
-        position: fixed;
-                top: 0;
-}
-.admin-bar .site-header.masthead-fixed {
-        top: 28px;
-}
-.admin-bar.mp6 .site-header.masthead-fixed {
-        top: 32px;
-}
 #site-header {
         position: relative;
         z-index: 3;
@@ -2662 +2649 @@
 }
 
 @media screen and (min-width: 770px) {
+        /* Fixed Header */
+        .site-header {
+                box-shadow: 0 1px 8px rgba(0, 0, 0, 0.2);
+                position: fixed;
+                top: 0;
+        }
+        .admin-bar .site-header {
+                top: 28px;
+        }
+        .admin-bar.mp6 .site-header {
+                top: 32px;
+        }
+        .site-main {
+                margin-top: 48px;
+        }
+        
         .header-main {
                 margin-right: 0;
         }