Merge pull request #11 from WhiteHouse/revert-6-gh-pages

Revert "Quick fix for mobile device styles"
WhiteHouse · Mar 10, 2016 · 8cfada0 · 8cfada0
2 parents 9ff427f + 14151bc
commit 8cfada0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -43,17 +43,17 @@
 <div class="container">
   <div>
     <header role="banner">
-       <div class="header_menu">
-         <a href="https://github.com/{{ site.org_name }}/{{ site.repo_name }}/issues/" style="color: white;" class="button">Discuss</a> |
-         <a href="https://github.com/{{ site.org_name }}/{{ site.repo_name }}/edit/{{ site.branch }}/{{ page.path }}" class="button" style="color: white;">Edit</a> |
+       <div style="float:right;">
+         <a href="https://github.com/{{ site.org_name }}/{{ site.repo_name }}/issues/" style="color: white;" class="button">Discuss</a> | 
+         <a href="https://github.com/{{ site.org_name }}/{{ site.repo_name }}/edit/{{ site.branch }}/{{ page.path }}" class="button" style="color: white;">Edit</a> | 
          <a href="{{ site.baseurl }}/SourceCodePolicy.pdf" class="button" style="color: white;">View PDF</a>
        </div>
       <h1>
         <a href="/">{{ site.name }}</a>
       </h1>
     </header>
   </div>
-
+ 
   <div class="wrap content">
     {% include sidebar.html %}
 

diff --git a/assets/css/styles.scss b/assets/css/styles.scss
@@ -14,7 +14,7 @@ $link-active:         #002d72;
 $link-hover:          #7eb8dd;
 
 $header-height:        80px;
-$header-height-mobile: 95px;
+$header-height-mobile: 65px;
 
 // Fonts
 $serif:               "Merriweather", "Georgia", "Times New Roman", serif;
@@ -104,6 +104,7 @@ header {
     color: $white;
 
     position: fixed;
+    height: $header-height;
     width: 100%;
 
     h1 {
@@ -123,20 +124,16 @@ header {
     }
 }
 
+aside {
+  @include span-columns(3.25);
+  margin-top: $header-height;
+}
+
 article {
   @include shift(0.25);
   @include span-columns(8);
   margin-bottom: 20px;
   margin-top: $header-height;
-  overflow: hidden; // accomdate long link text on mobile devices
-}
-
-@media screen and (min-width: 600px) {
-
-  .header_menu {
-    float: right;
-  }
-
 }
 
 @media screen and (max-width: 600px) {