Merge branch 'master' of https://github.com/GSA/sam-styles

README.md

@@ -12,7 +12,7 @@ npm start
 
 Then, visit [http://localhost:3000/](http://localhost:3000/) to see sam-styles in action.
 
-_**Optional**: To re-build when CSS changes are made, run the following command from the project directory in a separate terminal window:_
+To re-build when CSS changes are made, run the following command from the project directory in a separate terminal window:
 ```sh
-npm run watch
+npm run prod
 ```

src/components/_navigation/_nav-primary.njk → src/components/08-navigation/_nav-primary.njk

@@ -1,4 +1,4 @@
-<button class="usa-nav__close"><img src="{{ uswds.path }}/img/close.svg" alt="close"></button>
+<button class="usa-nav__close"><img src="{{ '/dist/img/close.svg' | path }}" alt="close"></button>
 <ul class="usa-nav__primary usa-accordion">
   {%- for link in nav.links -%}
   <li class="usa-nav__primary-item">

src/components/_navigation/nav-primary.config.yml → src/components/08-navigation/nav-primary.config.yml

@@ -1,7 +1,9 @@
 label: Primary (header)
+# preview: '@uswds-header'
 
 context:
   nav:
+    search: false
     links:
       - text: Current section
         is_current: true

src/components/_navigation/nav-secondary.config.yml → src/components/08-navigation/nav-secondary.config.yml

@@ -1,7 +1,9 @@
 label: Secondary (header)
+# preview: '@uswds-header'
 
 context:
   nav:
+    search: true
     links:
       - text: Secondary link
       - text: Another secondary link

src/components/_navigation/sidenav.njk → src/components/08-navigation/sidenav.njk

@@ -1,6 +1,6 @@
 {%- macro nav_list(links, subclass) -%}
   {%- for item in links -%}
-  <li class="usa-sidenav-item">
+  <li class="usa-sidenav__item">
     <a href="{{ item.href }}"{% if item.current %} class="usa-current"{% endif %}>{{ item.text }}</a>
     {%- if item.links -%}
     <ul class="{{ subclass }}">
@@ -13,6 +13,6 @@
 
 <nav>
   <ul class="usa-sidenav">
-    {{ nav_list(sidenav.links, 'usa-sidenav-sublist') }}
+    {{ nav_list(sidenav.links, 'usa-sidenav__sublist') }}
   </ul>
 </nav>

src/components/labels/labels--chip.njk

@@ -1,10 +1,8 @@
-<h3>Chip</h3>
-
 <span class="{{ label.classes }}">Normal</span>
 
-<span class="sam label">
-  Normal with icon
-  <button class="sam button tertiary">
+<span class="sam-tag sam-tag--chip">
+  Normal with close icon
+  <button class="sam-tag__close">
     <span class="fas fa-times" aria-hidden="true"></span>
   </button>
 </span>

src/components/labels/labels.config.yml

@@ -19,4 +19,4 @@ variants:
     label: Chip
     context:
       label: 
-        classes: "sam label"
+        classes: "sam-tag sam-tag--chip"