Merge branch 'gh-pages' into laravel-mix-and-fontawesome-v5

* gh-pages: fixes to header primary’s search drawer Fieldset guideline corrections Change font stack back to original Import normalize-scss npm module. Re-build and commit css files, map and package.json Add second colon for a pseudo elements Remove commented code in Base area Normalize as a reset Task #91: #91: fix the site messaging icons # Conflicts: # css/app.css # css/styles.css.map # demo/dropdown-simple.html # index.html # package-lock.json # package.json # resources/assets/sass/app.scss
imarc · Mar 20, 2018 · 86cc079 · 86cc079
2 parents 6d2fd27 + 5497809
commit 86cc079
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/css/styles.css.map b/css/styles.css.map
diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
@@ -272,6 +272,7 @@ img {
         }
     }
 }
+
 header.primary {
     background-color: $charcoal;
     position: relative;
-Original file line number
+Diff line change
@@ Expand Up / @@ -272,6 +272,7 @@ img { @@
             }
         }
     }
     header.primary {
         background-color: $charcoal;
         position: relative;
@@ Expand Down @@