Begin to unify layout templates.

exciting-io · Oct 31, 2013 · 3fb20de · 3fb20de
1 parent 5a4ab90
commit 3fb20de
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 136 deletions.
diff --git a/_assets/stylesheets/header.scss b/_assets/stylesheets/header.scss
@@ -17,15 +17,6 @@ header {
     }
   }
 
-  .strapline-row {
-    @include make-row();
-
-    .strapline {
-      @include make-md-column(10);
-      @include make-lg-column(8);
-    }
-  }
-
   nav {
     padding-top: $line-height-computed;
     padding-bottom: $line-height-computed;
@@ -79,11 +70,4 @@ header {
       }
     }
   }
-
-  .strapline {
-    @include font-body-italic;
-    color: $gray;
-    opacity: 0.7;
-    margin-bottom: 0;
-  }
 }
diff --git a/_assets/stylesheets/home.scss b/_assets/stylesheets/home.scss
@@ -1,4 +1,13 @@
 #home {
+  .strapline-row {
+    @include make-row();
+
+    .strapline {
+      @include make-md-column(10);
+      @include make-lg-column(8);
+    }
+  }
+
   .hero, .content {
     @include make-row();
   }
@@ -60,17 +69,11 @@
     @include font-body-italic;
   }
 
-  section {
-    margin-top: $line-height-computed;
-    margin-bottom: $line-height-computed * 2;
-
-    &:last-child {
-      margin-bottom: $line-height-computed;
-    }
-
-    @media (min-width: $screen-xs) {
-      margin-bottom: 0;
-    }
+  .strapline {
+    @include font-body-italic;
+    color: $gray;
+    opacity: 0.7;
+    margin-bottom: 0;
   }
 
   .hero {

diff --git a/_assets/stylesheets/main.scss b/_assets/stylesheets/main.scss
@@ -35,31 +35,15 @@ a {
   }
 }
 
-article, .post-container, .banner, aside {
-  // @media (max-width: $grid-float-breakpoint - 1) {
-  //   h1:first-child {
-  //     margin-top: 0;
-  //   }
-  // }
+section, article {
+  margin-top: $line-height-computed;
+  margin-bottom: $line-height-computed * 2;
 
-  // h1, h2 {
-  //   @include font-gentium;
-
-  //   strong {
-  //     font-family: 'Open Sans', sans-serif;
-  //     font-weight: 800;
-  //     text-transform: uppercase;
-  //     font-style: normal;
-  //   }
-  // }
-
-  // h3, h4, h5, h6 {
-  //   font-family: 'Gentium Basic', serif;
-  //   font-weight: 400;
-  //   font-style: italic;
-  // }
-}
+  &:last-child {
+    margin-bottom: $line-height-computed;
+  }
 
-img {
-  // width: 100%;
+  @media (min-width: $screen-xs) {
+    margin-bottom: 0;
+  }
 }
diff --git a/_layouts/basic.html b/_layouts/basic.html
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,20 +1,55 @@
----
-layout: basic
----
-<div class="container">
-  <header>
-    <div class="title"><h1><a href="/">{{ site.name }}</a></h1></div>
-    <nav class="navigation" role="navigation">
-      <ul>
-        <li><a href="/projects">Projects</a></li>
-        <li><a href="/blog">Blog</a></li>
-        <li><a href="/about">About</a></li>
-        <li><a href="/contact">Contact</a></li>
-      </ul>
-    </nav>
-  </header>
-</div>
-
-<div class="content">
-  {{ content }}
-</div>
+<!DOCTYPE html>
+<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>{{ page.title }} - {{ site.domain_name }}</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    {% stylesheet main %}
+
+    <link href='http://fonts.googleapis.com/css?family=Gentium+Book+Basic:300,400,400italic|Open+Sans:800' rel='stylesheet' type='text/css'>
+    <script type="text/javascript" src="//use.typekit.net/teq0fzf.js"></script>
+<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+  </head>
+  <body>
+    <!--[if lt IE 7]>
+        <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
+    <![endif]-->
+
+    <header class="container">
+      <nav>
+        <div class="title"><a href="/"><h1>Exciting</h1></a></div>
+        <ul class="navigation">
+          <li><a href="/about">About</a></li>
+          <li><a href="/blog">Blog</a></li>
+          <li><a href="/projects">Projects</a></li>
+        </ul>
+      </nav>
+    </header>
+
+    {{ content }}
+
+    <footer>
+      <div class="container">
+        <p>&copy; 2013 <a href="/">Exciting</a>.</p>
+      </div>
+    </footer>
+
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
+    <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.1.min.js"><\/script>')</script>
+
+    {% javascript main %}
+
+    <script>
+        var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];
+        (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
+        g.src='//www.google-analytics.com/ga.js';
+        s.parentNode.insertBefore(g,s)}(document,'script'));
+    </script>
+  </body>
+</html>
diff --git a/about/index.html b/about/index.html
@@ -3,10 +3,11 @@
 title: About
 ---
 
-<div class="container">
-  <article id="about">
-    <h1>About <strong>Exciting</strong></h1>
-    <p><strong>Exciting</strong> is a product and service development studio based in Austin, Texas. Our work spans the digital and physical.</p>
-    <p>We are interested in harnessing simple behaviours, actions, components and systems in order to produce novel, interesting and fun products.</p>
-  </article>
-</div>
+<main id="about" class="container">
+  <div class="row">
+    <article class="col-md-8 col-lg-8">
+      <p><strong>Exciting</strong> is a product and service development studio based in Austin, Texas. Our work spans the digital and physical.</p>
+      <p>We are interested in harnessing simple behaviours, actions, components and systems in order to produce novel, interesting and fun products.</p>
+    </article>
+  </div>
+</main>
diff --git a/index.html b/index.html
@@ -1,24 +1,13 @@
 ---
-layout: basic
+layout: default
 title: Home
 ---
 
-<header class="container">
-  <nav>
-    <div class="title"><a href="/"><h1>Exciting</h1></a></div>
-    <ul class="navigation">
-      <li><a href="/about">About</a></li>
-      <li><a href="/blog">Blog</a></li>
-      <li><a href="/projects">Projects</a></li>
-    </ul>
-  </nav>
-
+<main id="home" class="container">
   <div class="strapline-row">
     <p class="strapline">A digital product prototyping and development studio. We build software and tinker in hardware. We explore the potential of simple systems. Such as&hellip;</p>
   </div>
-</header>
 
-<main id="home" class="container">
   <section class="hero">
     <div class="product-image">
       <a href="https://harmonia.io"><img src="/images/harmonia/logo.png" /></a>