Merge pull request #8 from lewisnyman/typography-improvements

Tweaks to content and typography for better readablilty and heirachy

_includes/address.md

@@ -0,0 +1,6 @@
+<h2 class="footer-heading">Our address</h2>
+Convivio  
+The Gridiron Building  
+One Pancras Square  
+London  
+N1C 4AG

_includes/footer-nav.md

@@ -1,2 +1,5 @@
-* [Blog](https://blog.weareconvivio.com) 
-* [Cookbook](http://cookbook.weareconvivio.com/)
+<h2 class="footer-heading">Find us on the web</h2>
+* Read our blog on Medium: [https://blog.weareconvivio.com](https://blog.weareconvivio.com)
+* Browse our public intranet: [The Convivio Cookbok](http://cookbook.weareconvivio.com/)
+* Follow us on twitter: [@weareconvivio](https://twitter.com/weareconvivio)
+* Get in touch: <[email protected]>

_includes/footer.html

@@ -1,7 +1,15 @@
-<footer class="site-footer">
+<footer class="site-footer"  itemscope itemtype="http://schema.org/LocalBusiness">
   <div class="wrapper">
-    {% capture footer-nav-include %}{% include footer-nav.md %}{% endcapture %}
-    {{ footer-nav-include | markdownify }}
+    <div class=" footer-col-wrapper">
+      <div class="footer-col footer-col-1">
+        {% capture footer-nav-include %}{% include footer-nav.md %}{% endcapture %}
+        {{ footer-nav-include | markdownify }}
+      </div>
+      <div class="footer-col footer-col-2">
+        {% capture address-include %}{% include address.md %}{% endcapture %}
+        {{ address-include | markdownify }}
+      </div>
+    </div>
   </div>
 </footer>
 

_sass/_base.scss

@@ -75,7 +75,10 @@ li {
          margin-bottom: 0;
     }
 }
-
+.site-footer ul {
+  margin: 0;
+  list-style-type: none;
+}
 
 
 /**

_sass/_layout.scss

@@ -127,31 +127,13 @@
 }
 
 .footer-col-1 {
-    width: -webkit-calc(35% - (#{$spacing-unit} / 2));
-    width:         calc(35% - (#{$spacing-unit} / 2));
+    width: -webkit-calc(70% - (#{$spacing-unit} / 2));
+    width:         calc(70% - (#{$spacing-unit} / 2));
 }
 
 .footer-col-2 {
-    width: -webkit-calc(20% - (#{$spacing-unit} / 2));
-    width:         calc(20% - (#{$spacing-unit} / 2));
-}
-
-.footer-col-3 {
-    width: -webkit-calc(45% - (#{$spacing-unit} / 2));
-    width:         calc(45% - (#{$spacing-unit} / 2));
-}
-
-@include media-query($on-laptop) {
-    .footer-col-1,
-    .footer-col-2 {
-        width: -webkit-calc(50% - (#{$spacing-unit} / 2));
-        width:         calc(50% - (#{$spacing-unit} / 2));
-    }
-
-    .footer-col-3 {
-        width: -webkit-calc(100% - (#{$spacing-unit} / 2));
-        width:         calc(100% - (#{$spacing-unit} / 2));
-    }
+    width: -webkit-calc(30% - (#{$spacing-unit} / 2));
+    width:         calc(30% - (#{$spacing-unit} / 2));
 }
 
 @include media-query($on-palm) {

css/main.scss

@@ -6,15 +6,15 @@
 
 
 // Our variables
-$base-font-family: "Andale Mono", serif;
+$base-font-family: Helvetica, Arial, san-serif;
 $base-font-size:   16px;
 $base-font-weight: 400;
 $small-font-size:  $base-font-size * 0.875;
-$base-line-height: 1.5;
+$base-line-height: 1.4;
 
 $spacing-unit:     30px;
 
-$text-color:       #111;
+$text-color:       #333;
 $background-color: #ffffff;
 $brand-color:      #2a7ae2;
 

index.md

@@ -9,14 +9,4 @@ That means we take clients beyond simply marketing themselves on the web, to del
 
 Our team has delivered this digital transformation before in the government, finance, and media sectors.
 
-Read our blog on Medium: [https://blog.weareconvivio.com](https://blog.weareconvivio.com)  
-Follow us on twitter: [@weareconvivio](https://twitter.com/weareconvivio)  
-Get in touch: <[email protected]>  
-Our address:  
-Convivio  
-The Gridiron Building  
-One Pancras Square  
-London  
-N1C 4AG
-
 This is release 1 of our website, our ‘minimum launchable product’. We’re going to work in the open to develop our site, so you can see our workings-out. Follow thinking and progress on our [blog](https://blog.weareconvivio.com).