Merge branch 'master' into class-function

fourkitchens · Jun 22, 2017 · 541c97d · 541c97d
2 parents ca79489 + d4a0770
commit 541c97d
Show file tree

Hide file tree

Showing 9 changed files with 345 additions and 54 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/components/_patterns/00-base/_mixins.scss b/components/_patterns/00-base/_mixins.scss
@@ -15,7 +15,6 @@
 
 /// Mixin - list-reset
 /// Reset list item defaults when no margin, padding, list styles needed
-
 @mixin list-reset {
   list-style: none;
   margin: 0;
@@ -32,14 +31,6 @@
   padding: .8em;
 }
 
-/// Mixin - Icon with circular bg
-/// Mixin for the circular icon-bg (see source/patterns/01-atoms/headings for usage)
-@mixin icon-bg($color: $black) {
-  background-color: $color;
-  border-radius: 20px;
-  margin-right: .4em;
-}
-
 /// Mixin - Outer container
 /// Outer container mixin for large screens
 @mixin outer-container {

diff --git a/components/_patterns/01-atoms/04-images/icons/_icons.scss b/components/_patterns/01-atoms/04-images/icons/_icons.scss
@@ -13,13 +13,3 @@
     @include with-icon;
   }
 }
-
-.inline-arrow-down--bg {
-  display: flex;
-
-  &:before {
-    @include sprite-arrow-down;
-    @include with-icon;
-    @include icon-bg($gray-light);
-  }
-}
diff --git a/components/_patterns/01-atoms/04-images/icons/icons.md b/components/_patterns/01-atoms/04-images/icons/icons.md
@@ -14,10 +14,4 @@ If you look in `_icon_sprite.scss`, you will notice there is a mixin and class f
   @include ICONNAME; // e.g., sprite-chevron-right
   @include with-icon;
 }
-
-.TEXT_WITH_COLOR_BACKGROUND_ICON_BEFORE_IT {
-  @include ICONNAME; // e.g., sprite-chevron-right-white
-  @include with-icon;
-  @include icon-bg(COLOR); // color optional
-}
 ```
diff --git a/components/_patterns/01-atoms/04-images/icons/icons.twig b/components/_patterns/01-atoms/04-images/icons/icons.twig
@@ -11,5 +11,3 @@
 <h3 class="heading-3">Inline icon examples</h3>
 
 <p class="inline-arrow-down">See below for instructions</p>
-
-<p class="inline-arrow-down--bg">See below for instructions</p>
diff --git a/components/_patterns/03-organisms/site/site-footer/site-footer.twig b/components/_patterns/03-organisms/site/site-footer/site-footer.twig
@@ -1,3 +1,3 @@
-<footer class="site-footer">
+<footer class="footer">
   {{ content }}
 </footer>
diff --git a/components/_patterns/03-organisms/site/site-header/site-header.twig b/components/_patterns/03-organisms/site/site-header/site-header.twig
@@ -1,4 +1,4 @@
-<header class="site-header">
+<header class="header">
   <div class="navigation">
     {{ content }}
   </div>

diff --git a/...ents/_patterns/00-base/_outer-layout.scss → components/_patterns/05-pages/_page.scss b/...ents/_patterns/00-base/_outer-layout.scss → components/_patterns/05-pages/_page.scss
@@ -1,7 +1,7 @@
 
-header,
-main,
-footer {
+.header,
+.main,
+.footer {
   @include outer-container;
   margin-bottom: 4em;
 }

diff --git a/components/_patterns/05-pages/_page.twig b/components/_patterns/05-pages/_page.twig
@@ -58,7 +58,7 @@
 
   {{ messages }}
 
-  <main role="main">
+  <main role="main" class="main">
     <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
 
     {% if page.sidebar %}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,5 +11,3 @@
		<h3 class="heading-3">Inline icon examples</h3>

		<p class="inline-arrow-down">See below for instructions</p>

		<p class="inline-arrow-down--bg">See below for instructions</p>