Typography additions, should address #14

_settings.sass

@@ -21,6 +21,10 @@ $grid-tab-land-gutter: 14px !default
 $grid-med-desk-gutter: 20px !default
 $grid-widescreen-gutter: 24px !default
 
+// $grid-base-font-size
+$grid-baseline: 27px !default
+$grid-base-font-size: 17px !default
+
 // $grid-max-width, the widest .grid-wrap can possibly be
 $grid-max-width: 2000px !default
 
@@ -34,7 +38,7 @@ $grid-row-collapsed-doublepad: false !default
 // $column-count, the .grid-x classes widths are defined by dividing by this
 // number, if you want less than 12 columns reduce here. Currently more than
 // 12 is not supported, you could add more .grid-x classes for this to work.
-$grid-column-count: 12 !default
+$grid-column-count: 16 !default
 
 // Fancy transitions, requires Bourbon
 $grid-transition-enable: true !default

core/_typography.sass

@@ -1,10 +1,13 @@
-@mixin block
-  margin-bottom: $grid-baseline
+@mixin block($multiple: 1)
+  margin-bottom: $grid-baseline * $multiple
 
 @mixin baseline($multiple: 1)
   // Set line-height as a multiple of $grid-baseline
   line-height: $grid-baseline * $multiple
 
+@mixin font-size($multiple)
+  font-size: $grid-base-font-size * $multiple
+
 @function headings-selector($high, $low)
   // Recursive function to generate heading selectors
   @if $high==$low
@@ -32,7 +35,7 @@
   h6
     font-size: $base * $h6
 
-@mixin heading-height($base, $h1, $h2, $h3, $h4, $h5, $h6)
+@mixin heading-baseline($base, $h1, $h2, $h3, $h4, $h5, $h6)
   // Set H1 through H6 line-height to a multiple of $base
   h1
     line-height: $base * $h1
@@ -59,7 +62,7 @@
   figcaption
     @content
 
-@mixin word-wrap
+@mixin word-wrap-hyphens
   // Wrap words using hyphens
   word-break: break-word
   -webkit-hyphens: auto
@@ -71,3 +74,4 @@
   overflow: hidden
   text-overflow: ellipsis
   white-space: nowrap
+  word-wrap: normal