From e423021f477432198b068868e5982bf8a9569cd4 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 3 Oct 2014 16:53:38 -0400
Subject: [PATCH] update side sub nav

---
 css/app.css                | 98 +++++++++++++++++++++++---------------
 page.php                   |  2 +-
 scss/config/_settings.scss |  9 ++--
 scss/site/_structure.scss  | 61 ++++++++++++++++--------
 sidebar-left.php           |  2 +-
 5 files changed, 107 insertions(+), 65 deletions(-)

diff --git a/css/app.css b/css/app.css
index 3475917..133ee84 100644
--- a/css/app.css
+++ b/css/app.css
@@ -8657,7 +8657,7 @@ p {
 /* Default header styles */
 h1, h2, h3, h4, h5, h6 {
   font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
-  font-weight: normal;
+  font-weight: bold;
   font-style: normal;
   color: #222222;
   text-rendering: optimizeLegibility;
@@ -8673,13 +8673,13 @@ h1 {
   font-size: 2.125rem; }
 
 h2 {
-  font-size: 1.6875rem; }
+  font-size: 0.875rem; }
 
 h3 {
-  font-size: 1.375rem; }
+  font-size: 1.0625rem; }
 
 h4 {
-  font-size: 1.125rem; }
+  font-size: 0.9375rem; }
 
 h5 {
   font-size: 1.125rem; }
@@ -8831,11 +8831,11 @@ blockquote, blockquote p {
   h1 {
     font-size: 2.75rem; }
   h2 {
-    font-size: 2.3125rem; }
+    font-size: 1.5rem; }
   h3 {
-    font-size: 1.6875rem; }
+    font-size: 1.375rem; }
   h4 {
-    font-size: 1.4375rem; }
+    font-size: 1.25rem; }
   h5 {
     font-size: 1.125rem; }
   h6 {
@@ -11871,7 +11871,7 @@ p {
 /* Default header styles */
 h1, h2, h3, h4, h5, h6 {
   font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
-  font-weight: normal;
+  font-weight: bold;
   font-style: normal;
   color: #222222;
   text-rendering: optimizeLegibility;
@@ -11887,13 +11887,13 @@ h1 {
   font-size: 2.125rem; }
 
 h2 {
-  font-size: 1.6875rem; }
+  font-size: 0.875rem; }
 
 h3 {
-  font-size: 1.375rem; }
+  font-size: 1.0625rem; }
 
 h4 {
-  font-size: 1.125rem; }
+  font-size: 0.9375rem; }
 
 h5 {
   font-size: 1.125rem; }
@@ -12045,11 +12045,11 @@ blockquote, blockquote p {
   h1 {
     font-size: 2.75rem; }
   h2 {
-    font-size: 2.3125rem; }
+    font-size: 1.5rem; }
   h3 {
-    font-size: 1.6875rem; }
+    font-size: 1.375rem; }
   h4 {
-    font-size: 1.4375rem; }
+    font-size: 1.25rem; }
   h5 {
     font-size: 1.125rem; }
   h6 {
@@ -12436,7 +12436,7 @@ p {
 /* Default header styles */
 h1, h2, h3, h4, h5, h6 {
   font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
-  font-weight: normal;
+  font-weight: bold;
   font-style: normal;
   color: #222222;
   text-rendering: optimizeLegibility;
@@ -12452,13 +12452,13 @@ h1 {
   font-size: 2.125rem; }
 
 h2 {
-  font-size: 1.6875rem; }
+  font-size: 0.875rem; }
 
 h3 {
-  font-size: 1.375rem; }
+  font-size: 1.0625rem; }
 
 h4 {
-  font-size: 1.125rem; }
+  font-size: 0.9375rem; }
 
 h5 {
   font-size: 1.125rem; }
@@ -12610,11 +12610,11 @@ blockquote, blockquote p {
   h1 {
     font-size: 2.75rem; }
   h2 {
-    font-size: 2.3125rem; }
+    font-size: 1.5rem; }
   h3 {
-    font-size: 1.6875rem; }
+    font-size: 1.375rem; }
   h4 {
-    font-size: 1.4375rem; }
+    font-size: 1.25rem; }
   h5 {
     font-size: 1.125rem; }
   h6 {
@@ -13480,10 +13480,12 @@ body {
   padding-top: 20px;
   height: 100px; }
 
-.container {
+#home.container {
   background-color: white;
   max-width: 1000px;
-  margin: 0 auto; }
+  margin: 0 auto;
+  box-shadow: 0 0 10px black;
+  /*border: 1px solid $black;*/ }
 
 .top-bar-container {
   float: right;
@@ -13564,22 +13566,6 @@ ul.global-nav li + li::before {
   margin-top: 45px;
   margin-left: 50px; }
 
-/*#glmLogo {*/
-/*position: absolute;*/
-/*z-index: 9999;*/
-/*top: 52px;*/
-/*left: 50px;*/
-/*position: absolute;*/
-/*z-index: 9999;*/
-/*}*/
-#glmBottom {
-  background: linear-gradient(180deg, #1162a2, #5095ca);
-  height: 170px;
-  width: 100%;
-  margin-bottom: 50px;
-  text-align: center;
-  color: white; }
-
 .glmSocial {
   width: 250px;
   color: #f48228;
@@ -13614,6 +13600,19 @@ ul.global-nav li + li::before {
     margin: 0 10px;
     padding: 0; }
 
+#glmBottom {
+  background: linear-gradient(180deg, #1162a2, #5095ca);
+  text-align: center;
+  color: white;
+  height: auto;
+  margin-bottom: 0; }
+
+@media only screen and (min-width:64.063em) {
+  #glmBottom {
+    height: 170px;
+    width: 100%;
+    margin-bottom: 50px; } }
+
 .vcard li {
   display: inline-block; }
 
@@ -13722,6 +13721,27 @@ aside.left-off-canvas-menu ul.off-canvas-list li > ul li > a {
 aside.left-off-canvas-menu ul.off-canvas-list li > ul.open {
   display: block; }
 
+aside#sidebar {
+  background-color: #f3f3f4;
+  color: #f48228;
+  padding-top: 10px;
+  margin-top: 68px;
+  width: 280px;
+  border-radius: 0 10px 10px 0; }
+
+aside#sidebar li {
+  list-style: none; }
+
+aside#sidebar a {
+  color: #f48228;
+  font-weight: bold; }
+
+article header h1 {
+  border-bottom: solid 1px #f48228; }
+
+article h2 {
+  color: #0568b3; }
+
 .top-bar-container, .tab-bar {
   margin-bottom: 2rem; }
 
diff --git a/page.php b/page.php
index 23e9afb..1376815 100644
--- a/page.php
+++ b/page.php
@@ -1,6 +1,7 @@
 <?php get_header(); ?>
 
 <div class="row">
+    <?php get_sidebar('left'); ?>
     <div class="small-12 large-8 columns" role="main">
 
     <?php do_action('foundationPress_before_content'); ?>
@@ -27,6 +28,5 @@
     <?php do_action('foundationPress_after_content'); ?>
 
     </div>
-    <?php get_sidebar(); ?>
 </div>
 <?php get_footer(); ?>
diff --git a/scss/config/_settings.scss b/scss/config/_settings.scss
index 10c90c2..b0477f5 100644
--- a/scss/config/_settings.scss
+++ b/scss/config/_settings.scss
@@ -134,6 +134,7 @@ $include-html-global-classes: $include-html-classes;
 // $default-float: left;
 // $last-child-float: $opposite-direction;
 
+$glm-border-radius: 10px;
 // We use these to make sure border radius matches unless we want it different.
 // $global-radius: 3px;
 // $global-rounded: 1000px;
@@ -191,7 +192,7 @@ $include-html-global-classes: $include-html-classes;
 
 // We use these to control header font styles
  $header-font-family: $body-font-family;
- $header-font-weight: $font-weight-normal;
+ $header-font-weight: $font-weight-bold;
  $header-font-style: normal;
  $header-font-color: $jet;
  $header-line-height: 1.4;
@@ -201,9 +202,9 @@ $include-html-global-classes: $include-html-classes;
 
 // We use these to control header font sizes
  $h1-font-size: rem-calc(44);
- $h2-font-size: rem-calc(37);
- $h3-font-size: rem-calc(27);
- $h4-font-size: rem-calc(23);
+ $h2-font-size: rem-calc(24);
+ $h3-font-size: rem-calc(22);
+ $h4-font-size: rem-calc(20);
  $h5-font-size: rem-calc(18);
  $h6-font-size: 1rem;
 
diff --git a/scss/site/_structure.scss b/scss/site/_structure.scss
index 84048e1..75a2b7d 100644
--- a/scss/site/_structure.scss
+++ b/scss/site/_structure.scss
@@ -31,10 +31,12 @@ body {
     height: 100px;
 }
 
-.container {
+#home.container {
     background-color: $white;
     max-width: 1000px;
     margin: 0 auto;
+    box-shadow: 0 0 10px $black;
+    /*border: 1px solid $black;*/
 }
 .top-bar-container {
     float: right;
@@ -43,13 +45,13 @@ body {
     margin-bottom: 0 !important;
     width: 578px;
     height: 65px;
-    border-radius: 10px 0 0 0;
+    border-radius: $glm-border-radius 0 0 0;
 }
 nav.top-bar {
     height: 60px;
     width: 550px;
     float: right;
-    border-radius: 10px 0 0 0;
+    border-radius: $glm-border-radius 0 0 0;
 }
 #menu-menu-1 li:first-of-type {
     display: none;
@@ -115,22 +117,6 @@ ul.global-nav li + li::before {
     margin-top: 45px;
     margin-left: 50px;
 }
-/*#glmLogo {*/
-    /*position: absolute;*/
-    /*z-index: 9999;*/
-    /*top: 52px;*/
-    /*left: 50px;*/
-    /*position: absolute;*/
-    /*z-index: 9999;*/
-/*}*/
-#glmBottom {
-    background: linear-gradient(180deg, #1162A2, #5095CA);
-    height: 170px;
-    width: 100%;
-    margin-bottom: 50px;
-    text-align: center;
-    color: $white;
-}
 
 .glmSocial {
     width: 250px;
@@ -158,6 +144,21 @@ ul.global-nav li + li::before {
         padding: 0;
     }
 }
+// Footer area
+#glmBottom {
+    background: linear-gradient(180deg, #1162A2, #5095CA);
+    text-align: center;
+    color: $white;
+    height: auto;
+    margin-bottom:0;
+}
+@media #{$large-up} {
+    #glmBottom {
+        height: 170px;
+        width: 100%;
+        margin-bottom: 50px;
+    }
+}
 .vcard li {
     display: inline-block;
 }
@@ -280,7 +281,27 @@ aside.left-off-canvas-menu ul.off-canvas-list li > ul li > a {
 aside.left-off-canvas-menu ul.off-canvas-list li > ul.open {
   display: block;
 }
-
+aside#sidebar {
+    background-color: #F3F3F4;
+    color: $secondary-color;
+    padding-top: 10px;
+    margin-top: 68px;
+    width: 280px;
+    border-radius: 0 $glm-border-radius $glm-border-radius 0;
+}
+aside#sidebar li {
+    list-style: none;
+}
+aside#sidebar a {
+    color: $secondary-color;
+    font-weight: bold;
+}
+article header h1 {
+    border-bottom: solid 1px $secondary-color;
+}
+article h2 {
+    color: $primary-color;
+}
 // Add some whitespace between top bar and content
 .top-bar-container, .tab-bar {
     margin-bottom: rem-calc(32);
diff --git a/sidebar-left.php b/sidebar-left.php
index cec138b..3edd2e9 100644
--- a/sidebar-left.php
+++ b/sidebar-left.php
@@ -1,4 +1,4 @@
-<aside id="sidebar" class="small-12 large-4 columns large-pull-8">
+<aside id="sidebar" class="small-12 large-4 columns">
     <?php do_action('foundationPress_before_sidebar'); ?>
     <?php dynamic_sidebar("sidebar-widgets"); ?>
     <?php do_action('foundationPress_after_sidebar'); ?>
-- 
2.17.1