From 34ef0ec8b293eb1712e6f10b0fafff5882bc3691 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 6 Feb 2012 13:36:16 -0500
Subject: [PATCH] Added styles for collapsable navigation

---
 navigation.html     |  6 +++--
 sass/_layout.scss   | 62 +++++++++++++++++++++++++++++++--------------
 sass/_textbook.scss |  4 ++-
 3 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/navigation.html b/navigation.html
index b639dc5b28..3b4b50d314 100644
--- a/navigation.html
+++ b/navigation.html
@@ -1,10 +1,12 @@
 <%page args="active_page" />
 <div class="header-wrapper">
   <header>
-    <h1><em>MITx</em></h1>
+    <hgroup>
+      <h1><em>MITx</em></h1>
+      <h2><a href="/courseware">Circuits and Electronics</a></h2>
+    </hgroup>
 
     <nav class="${active_page}">
-      <h2><a href="/courseware">Circuits and Electronics</a></h2>
 
       <ul class="coursenav">
         <li class="courseware"><a href="/courseware">Courseware</a></li>
diff --git a/sass/_layout.scss b/sass/_layout.scss
index 89c216e26d..4bf26415b4 100644
--- a/sass/_layout.scss
+++ b/sass/_layout.scss
@@ -20,33 +20,29 @@ html {
         @include box-sizing(border-box);
         padding: 0 $body-line-height;
 
-        h1 {
-          border-right: 1px solid darken($mit-red, 5%);
-          color: #000;
-          display: block;
+        hgroup {
           float: left;
-          font-size: 20px;
-          font-weight: 800;
-          margin: 0 lh() 0 0;
-          padding: 17px lh() 14px 0;
-          text-shadow: 0 1px 0 lighten($mit-red, 10%);
-          line-height: lh();
-        }
+          @extend .clearfix;
 
-        nav {
-          float: left;
-          display: block;
-          margin: 0;
-          padding: 0;
-          text-shadow: 0 -1px 0 darken($mit-red, 10%);
-          -webkit-font-smoothing: antialiased;
+          h1 {
+            border-right: 1px solid darken($mit-red, 5%);
+            color: darken($mit-red, 20%);
+            font-size: 20px;
+            font-weight: 800;
+            margin: 0 lh() 0 0;
+            padding: 17px lh() 14px 0;
+            text-shadow: 0 1px 0 lighten($mit-red, 10%);
+            line-height: lh();
+            @include inline-block();
+          }
 
           h2 {
-            float: left;
+            @include inline-block();
             margin: 0 lh() 0 0;
             padding: 19px lh() 9px 0;
             line-height: lh();
             border-right: 1px solid darken($mit-red, 5%);
+            -webkit-font-smoothing: antialiased;
 
             a {
               color: #fff;
@@ -58,6 +54,34 @@ html {
             }
           }
 
+          @media screen and (max-width: 920px) {
+            border-bottom: 1px solid darken($mit-red, 5%);
+            display: block;
+            float: none;
+
+            h1 {
+              float: left;
+              border: 0;
+            }
+
+            h2 {
+              float: right;
+              border: 0;
+              margin-right: 0;
+              padding-right: 0;
+            }
+          }
+        }
+
+        nav {
+          float: left;
+          display: block;
+          margin: 0;
+          padding: 0;
+          text-shadow: 0 -1px 0 darken($mit-red, 10%);
+          -webkit-font-smoothing: antialiased;
+
+
           ul {
             @extend .clearfix;
             display: inline-block;
diff --git a/sass/_textbook.scss b/sass/_textbook.scss
index 2212367a02..0f066f2126 100644
--- a/sass/_textbook.scss
+++ b/sass/_textbook.scss
@@ -48,6 +48,7 @@ div.book-wrapper {
 
       a {
         @extend .block-link;
+        padding: 14px;
       }
 
       ul {
@@ -74,10 +75,11 @@ div.book-wrapper {
     }
 
     section.page {
+      text-align: center;
+
       img {
         border: 1px solid $border-color;
         max-width: 100%;
-        min-width: 100%;
       }
     }
   }