From cd6c4088b58b715d9044a0bcf64ebbb500c1d070 Mon Sep 17 00:00:00 2001
From: Robert Messerle <rmesserle@google.com>
Date: Wed, 5 Aug 2015 12:37:17 -0700
Subject: [PATCH] chore(css): re-adds includes from previous commit, includes
 @alternate comments for duplicate styles

---
 src/components/list/list.scss       | 17 ++++++++---------
 src/components/toolbar/toolbar.scss |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/components/list/list.scss b/src/components/list/list.scss
index 2d8a002005c..4f27fe8f08d 100644
--- a/src/components/list/list.scss
+++ b/src/components/list/list.scss
@@ -30,9 +30,8 @@ md-list {
   padding: $list-padding-top $list-padding-right $list-padding-bottom $list-padding-left;
 
   .md-subheader {
-    font-size: $body-font-size-base;
-    font-weight: 500;
-    letter-spacing: 0.010em;
+    @include md-body-2();
+    /* @alternate */
     line-height: $list-header-line-height;
   }
 }
@@ -179,17 +178,17 @@ md-list-item.md-3-line > .md-no-style {
     }
 
     h3 {
-      font-size: $subhead-font-size-base;
-      font-weight: 400;
-      letter-spacing: 0.010em;
+      @include md-subhead();
       margin: $list-h3-margin;
+      /* @alternate */
       line-height: $list-header-line-height;
     }
     h4 {
-      font-size: $body-font-size-base;
-      letter-spacing: 0.010em;
-      font-weight: $list-h4-font-weight;
+      @include md-body-2();
       margin: $list-h4-margin;
+      /* @alternate */
+      font-weight: $list-h4-font-weight;
+      /* @alternate */
       line-height: $list-header-line-height;
     }
     p {
diff --git a/src/components/toolbar/toolbar.scss b/src/components/toolbar/toolbar.scss
index 67a3c9ae18c..d0009ae2ae5 100644
--- a/src/components/toolbar/toolbar.scss
+++ b/src/components/toolbar/toolbar.scss
@@ -74,7 +74,7 @@ md-toolbar {
   height: $toolbar-tools-height;
   max-height: $toolbar-tools-height;
   padding: 0 $toolbar-padding;
-  margin: 0;
+  /* @alternate */ margin: 0;
 
   h1, h2, h3 {
     font-size: inherit;