Merge pull request #4 from AndrewBrinker/gh-pages

A new look sure why not - chewxy
chewxy · Jul 5, 2014 · 720a80a · 720a80a
2 parents 997d973 + a175a2d
commit 720a80a
Show file tree

Hide file tree

Showing 13 changed files with 167 additions and 185 deletions.
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -14,18 +14,16 @@
   <link href='http://fonts.googleapis.com/css?family=Gentium+Book+Basic:400,400italic,700,700italic' rel='stylesheet' type='text/css'>
   <link href='http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300,700' rel='stylesheet' type='text/css'>
 
-  <link rel="stylesheet" href="assets/css/main.css">
-  <script src="assets/js/vendor/modernizr-2.6.2.min.js"></script>
+  <link rel="stylesheet" href="/assets/css/main.css">
+  <script src="/assets/js/vendor/modernizr-2.6.2.min.js"></script>
 </head>
 <body class="{{ page.keyword }}">
 
-  <div id='top' class='container'>
     {{ content }}
-  </div> <!-- /.container -->
 
   <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-  <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-1.10.2.min.js"><\/script>')</script>
-  <script src="assets/js/plugins.js"></script>
-  <script src="assets/js/main.js"></script>
+  <script>window.jQuery || document.write('<script src="/assets/js/vendor/jquery-1.10.2.min.js"><\/script>')</script>
+  <script src="/assets/js/plugins.js"></script>
+  <script src="/assets/js/main.js"></script>
 </body>
-</html>
+</html>
diff --git a/assets/css/main.css b/assets/css/main.css
diff --git a/assets/sass/main.scss b/assets/sass/main.scss
@@ -37,7 +37,7 @@
     $NEAT
  *------------------------------------*/
 
-$max-width: 56em;
+$max-width: 36em;
 $gutter: 4em;
 $grid-columns: 8;
 $visual-grid: false;
@@ -72,9 +72,8 @@ $box-sizing: border-box;
     $COLORS
  *------------------------------------*/
 
-$background-color:     #f7f7f7;
-$alt-background-color: #fff;
-$text-color:           #506266;
+$background-color:     #fff;
+$text-color:           #3e494f;
 $main-color:           #d3643b;
 $accent-color:         #fb7848;
 
@@ -86,7 +85,7 @@ $accent-color:         #fb7848;
     $FONT SIZES
  *------------------------------------*/
 
-$base-font-size:    16px!default;
+$base-font-size:    20px!default;
 $base-line-height:  px(1.667)!default;
 
 $giga-size:         px(5)!default;
@@ -174,3 +173,4 @@ $close-quote:    null;
 @import 'modules/header';
 @import 'modules/content';
 @import 'modules/footer';
+@import 'modules/section';
diff --git a/assets/sass/modules/_button.scss b/assets/sass/modules/_button.scss
diff --git a/assets/sass/modules/_container.scss b/assets/sass/modules/_container.scss
@@ -1,19 +1,10 @@
 .container {
     padding: 2em 0;
-    margin: 0 1em 1em;
-    border-top: .5em solid #000;
-    background: $alt-background-color;
-    box-shadow: rgba(0,0,0,.1) 0 2px 3px;
+    margin: 1em;
 }
 
 @media screen and (min-width: $small-breakpoint) {
     .container {
         @include outer-container();
-        @include box-sizing(content-box);
-        margin-bottom: 4em;
-        padding-top: 2em;
-        padding-left: 4em;
-        padding-right: 4em;
-        background: $alt-background-color;
     }
-}
+}
diff --git a/assets/sass/modules/_content.scss b/assets/sass/modules/_content.scss
@@ -1,15 +1,4 @@
 .content {
-    padding: 0 2em;
+    padding: 0;
+    margin-bottom: 3em;
 }
-
-@media screen and (min-width: $small-breakpoint) {
-    .content {
-        @include span-columns(6);
-        @include omega();
-        padding: 0;
-    }
-
-        .content h2 {
-            margin-bottom: .5em;
-        }
-}
diff --git a/assets/sass/modules/_footer.scss b/assets/sass/modules/_footer.scss
@@ -1,13 +1,11 @@
 .footer {
     @include reset-display();
-    padding: 1em 2em 0;
-    margin-top: 4em;
-    border-top: 1px solid rgba(0,0,0,.1);
+    padding: 1em 1em 0;
 }
 
 @media screen and (min-width: $small-breakpoint) {
     .footer {
         @include span-columns(8 of 8);
         padding: 1em 0 0;
     }
-}
+}