From 0e1ab986f8d4974d85863b85af599ae9559ba541 Mon Sep 17 00:00:00 2001
From: Kevin Ross <kevin.ross@alienfast.com>
Date: Sun, 6 Dec 2015 09:29:08 -0600
Subject: [PATCH] #755 reviewed typography against the spec, seems like a good
 starting point.

---
 Gruntfile.js                       |  6 +++++-
 docs/content/typography.md         |  2 +-
 scss/includes/_type.scss           | 29 ++++-------------------------
 scss/includes/variables/_type.scss | 13 ++++++++-----
 4 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 67e73f5b..37debcd1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -415,7 +415,11 @@ module.exports = function (grunt) {
         options: {
           // //https://regex101.com/r/cZ7aO8/2
           process: function (content, srcpath) {
-            return content.replace(/(---[\s\S]+?---)([\s\S]+)/mg, referenceDocNotice);
+            return content
+              // insert docs reference
+              .replace(/(---[\s\S]+?---)([\s\S]+)/mg, referenceDocNotice)
+              // remove sample text 'display' as this is a particular style and is confusing
+              .replace(/Fancy display heading/, 'Fancy heading');
           }
         },
         expand: true,
diff --git a/docs/content/typography.md b/docs/content/typography.md
index 6c3cf045..7b5ba589 100644
--- a/docs/content/typography.md
+++ b/docs/content/typography.md
@@ -83,7 +83,7 @@ Use the included utility classes to recreate the small secondary heading text fr
 
 {% example html %}
 <h3>
-  Fancy display heading
+  Fancy heading
   <small class="text-muted">With faded secondary text</small>
 </h3>
 {% endexample %}
diff --git a/scss/includes/_type.scss b/scss/includes/_type.scss
index b400a986..553c9da7 100644
--- a/scss/includes/_type.scss
+++ b/scss/includes/_type.scss
@@ -1,25 +1,4 @@
-
-//body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4 {
-//  //font-family: $font-family-sans-serif;
-//  //font-weight: 300;
-//}
-//
-//h5, h6{
-//  font-weight: 400;
-//}
-//
-//.text-warning {
-//  color: $brand-warning;
-//}
-//.text-primary {
-//  color: $brand-primary;
-//}
-//.text-danger {
-//  color: $brand-danger;
-//}
-//.text-success {
-//  color: $brand-success;
-//}
-//.text-info {
-//  color: $brand-info;
-//}
+// adjust up the h6 weight
+h6 {
+  font-weight: 500;
+}
diff --git a/scss/includes/variables/_type.scss b/scss/includes/variables/_type.scss
index c7865413..5116c9b5 100644
--- a/scss/includes/variables/_type.scss
+++ b/scss/includes/variables/_type.scss
@@ -2,6 +2,9 @@
 //
 // Font, line-height, and color for body text, headings, and more.
 
+// https://www.google.com/design/spec/style/typography.html#typography-styles
+// http://www.getmdl.io/styles/index.html
+
 $font-family-sans-serif: 'Roboto', 'Helvetica', 'Arial', sans-serif !default;
 //$font-family-serif:          Georgia, "Times New Roman", Times, serif !default;
 //$font-family-monospace:      Menlo, Monaco, Consolas, "Courier New", monospace !default;
@@ -22,10 +25,10 @@ $font-family-sans-serif: 'Roboto', 'Helvetica', 'Arial', sans-serif !default;
 //$font-size-h5:               1.25rem !default;
 //$font-size-h6:               1rem !default;
 //
-//$display1-size:               6rem !default;
-//$display2-size:               5.5rem !default;
-//$display3-size:               4.5rem !default;
-//$display4-size:               3.5rem !default;
+$display1-size:               7rem !default; // md display-4 112px was 6rem;
+$display2-size:               3.5rem !default; // md display-3 56px was 5.5rem
+$display3-size:               2.8125rem !default; // md display-2 45px was 4.5rem
+$display4-size:               2.125rem !default; // md display-1 34px was 3.5rem
 //
 //$display1-weight:             300 !default;
 //$display2-weight:             300 !default;
@@ -36,7 +39,7 @@ $font-family-sans-serif: 'Roboto', 'Helvetica', 'Arial', sans-serif !default;
 //
 //$headings-margin-bottom:     ($spacer / 2) !default;
 //$headings-font-family:       inherit !default;
-//$headings-font-weight:       500 !default;
+$headings-font-weight:       400 !default; // was 500
 //$headings-line-height:       1.1 !default;
 //$headings-color:             inherit !default;
 //