Ticket #947: 947.diff

wp-content/themes/pub/wporg-themes/header.php

@@ -13 +13 @@
 <div id="headline">
         <div class="wrapper">
                 <h2 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h2>
-                <nav id="site-navigation" class="main-navigation" role="navigation">
-                        <?php
-                                wp_nav_menu( array(
-                                        'theme_location' => 'primary',
-                                        'container'      => false,
-                                        'depth'          => 1,
-                                ) );
-                        ?>
-                </nav>
         </div>
 </div>
+<nav id="site-navigation" class="main-navigation" role="navigation">
+        <?php
+                wp_nav_menu( array(
+                        'theme_location' => 'primary',
+                        'container'      => false,
+                        'depth'          => 1,
+                ) );
+        ?>
+</nav>
+ No newline at end of file

wp-content/themes/pub/wporg-themes/style.css

@@ -71 +71 @@
 }
 
 /* assorted overrides */
-#headline {
-        height: auto;
-}
-
 #headline h2 {
         margin-bottom: 16px;
 }
@@ -403 +399 @@
         -webkit-box-sizing: border-box;
         -moz-box-sizing: border-box;
         box-sizing: border-box;
-        margin: 12px 0 25px;
+        margin: 20px 0 25px;
         padding: 0 20px;
         width: 100%;
         -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
@@ -762 +758 @@
 }
 
 /* Secondary header design */
+.main-navigation {
+        background: #dfdfdf;
+}
+
 .main-navigation .menu {
-        float: right;
-        font-size: 14px;
+        font-size: 13px;
         font-weight: bold;
         list-style: none;
-        margin-right: 15px;
-        padding-top: 22px;
+        margin: 0 auto;
+        padding: 10px 0;
+        width: 960px;
 }
 
 .main-navigation .menu li {
@@ -779 +779 @@
          padding-left: 10px;
 }
 
+#site-navigation.main-navigation a {
+        color: #636363;
+}
+
 #site-navigation.main-navigation a:hover,
 #site-navigation.main-navigation a:focus {
         color: #2ea2cc;
@@ -790 +794 @@
                 float: none;
         }
         .main-navigation .menu {
-                background: #f5f5f5;
-                border-top: 1px solid #d7d7d7;
                 margin: 0;
                 padding: 8px 0;
                 width: 100%;