chore(css): re-adds includes from previous commit, includes @alternate …

…comments for duplicate styles
angular · Aug 5, 2015 · cd6c408 · cd6c408
1 parent a9f2da3
commit cd6c408
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git 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
@@ -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;