From c28defb485229e70104e9c1b1476604b6fb8d442 Mon Sep 17 00:00:00 2001
From: Aaron Froehlich <aaronfroehlich@gmail.com>
Date: Fri, 2 Jun 2017 15:17:30 -0400
Subject: [PATCH] Fixed install bug re sass compile errors

---
 .../styleguide/css/styleguide-specific.css    | 99 +++++++++++++++++++
 .../css/styleguide-specific.min.css           |  1 +
 web/themes/dashing/scss/dashing.scss          |  2 +-
 3 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 web/themes/dashing/pattern-lab/source/styleguide/css/styleguide-specific.css
 create mode 100644 web/themes/dashing/pattern-lab/source/styleguide/css/styleguide-specific.min.css

diff --git a/web/themes/dashing/pattern-lab/source/styleguide/css/styleguide-specific.css b/web/themes/dashing/pattern-lab/source/styleguide/css/styleguide-specific.css
new file mode 100644
index 0000000..85f0ffe
--- /dev/null
+++ b/web/themes/dashing/pattern-lab/source/styleguide/css/styleguide-specific.css
@@ -0,0 +1,99 @@
+/*------------------------------------*\
+    $PATTERN LAB-SPECIFIC STYLES
+\*------------------------------------*/
+/**
+ * This stylesheet is for styles you want to include only when the interface is being viewed within Pattern Lab.
+ * This is helpful for displaying demo styles for grids, animations, color swatches, etc
+ * It's also helpful for overriding context-specific styles like fixed or absolutely positioned elements
+ * These styles will not be your production CSS.
+ */
+/* Style Guide Interface Colors */
+/* Typography */
+/* Defaults */
+/* Dimensions */
+/* Breakpoints */
+.demo {
+  overflow: hidden;
+  margin-bottom: 1rem;
+}
+
+.demo .gi, .demo .demo-block {
+  background: #ddd;
+  color: #808080;
+  text-align: center;
+  margin-bottom: 0.5em;
+  padding: 1em !important;
+}
+.demo .gi:nth-of-type(2n), .demo .demo-block:nth-of-type(2n) {
+  color: #ddd;
+  background: #808080;
+}
+.demo .gi .gi, .demo .demo-block .gi {
+  background: rgba(0, 0, 0, 0.1);
+  color: #ddd;
+}
+.demo .gi .gi:nth-of-type(2n), .demo .demo-block .gi:nth-of-type(2n) {
+  background: rgba(0, 0, 0, 0.3);
+}
+
+.demo-animate {
+  background: #ddd;
+  padding: 1em;
+  margin-bottom: 1em;
+  text-align: center;
+}
+
+.animate-move {
+  position: relative;
+}
+.animate-move .demo-shape {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  width: 20px;
+  background: #808080;
+}
+.animate-move:hover > .demo-shape {
+  left: 100%;
+  margin-left: -20px;
+}
+
+.sg-colors {
+  overflow: hidden;
+}
+.sg-colors li {
+  overflow: hidden;
+  border: 1px solid #ddd;
+  padding: 0.3em;
+  margin: 0 0.2em 0.2em 0;
+}
+@media all and (min-width: 30em) {
+  .sg-colors li {
+    float: left;
+    width: 5em;
+  }
+}
+
+.sg-swatch {
+  display: block;
+  height: 1.5em;
+  width: 50%;
+}
+@media all and (max-width: 30em) {
+  .sg-swatch {
+    float: left;
+    margin-right: 0.3em;
+  }
+}
+@media all and (min-width: 30em) {
+  .sg-swatch {
+    width: 100%;
+    height: 4em;
+    margin-bottom: 0.2em;
+  }
+}
+
+.sg-label {
+  line-height: 1;
+}
diff --git a/web/themes/dashing/pattern-lab/source/styleguide/css/styleguide-specific.min.css b/web/themes/dashing/pattern-lab/source/styleguide/css/styleguide-specific.min.css
new file mode 100644
index 0000000..c8724b6
--- /dev/null
+++ b/web/themes/dashing/pattern-lab/source/styleguide/css/styleguide-specific.min.css
@@ -0,0 +1 @@
+.demo{overflow:hidden;margin-bottom:1rem}.demo .demo-block,.demo .gi{background:#ddd;color:grey;text-align:center;margin-bottom:.5em;padding:1em!important}.demo .demo-block:nth-of-type(2n),.demo .gi:nth-of-type(2n){color:#ddd;background:grey}.demo .demo-block .gi,.demo .gi .gi{background:rgba(0,0,0,.1);color:#ddd}.demo .demo-block .gi:nth-of-type(2n),.demo .gi .gi:nth-of-type(2n){background:rgba(0,0,0,.3)}.demo-animate{background:#ddd;padding:1em;margin-bottom:1em;text-align:center}.animate-move{position:relative}.animate-move .demo-shape{position:absolute;top:0;left:0;bottom:0;width:20px;background:grey}.animate-move:hover>.demo-shape{left:100%;margin-left:-20px}.sg-colors{overflow:hidden}.sg-colors li{overflow:hidden;border:1px solid #ddd;padding:.3em;margin:0 .2em .2em 0}@media all and (min-width:30em){.sg-colors li{float:left;width:5em}}.sg-swatch{display:block;height:1.5em;width:50%}@media all and (max-width:30em){.sg-swatch{float:left;margin-right:.3em}}@media all and (min-width:30em){.sg-swatch{width:100%;height:4em;margin-bottom:.2em}}.sg-label{line-height:1}
\ No newline at end of file
diff --git a/web/themes/dashing/scss/dashing.scss b/web/themes/dashing/scss/dashing.scss
index c418130..79c5b29 100755
--- a/web/themes/dashing/scss/dashing.scss
+++ b/web/themes/dashing/scss/dashing.scss
@@ -4,7 +4,7 @@
  */
 
 // Start libs
-@import "bootstrap/scss/bootstrap-flex.scss";
+@import "bootstrap/scss/bootstrap.scss";
 @import "singularitygs/stylesheets/singularitygs";
 @import "breakpoint-sass/stylesheets/breakpoint";
 // End libs