From c65fff82caaefb76f0a0241949aca56296afd8ec Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 19 Dec 2017 14:00:45 -0800
Subject: [PATCH] Shuffle around styles to better organize around net new code
 and bulma overrides

---
 ui/app/styles/components.scss                 |  1 +
 .../{core => components}/page-layout.scss     |  5 ---
 ui/app/styles/core.scss                       | 45 ++-----------------
 ui/app/styles/core/variables.scss             | 35 +++++++++++++++
 ui/app/styles/{core => utils}/bumper.scss     |  0
 ui/app/styles/utils/reset.scss                |  6 +++
 6 files changed, 46 insertions(+), 46 deletions(-)
 rename ui/app/styles/{core => components}/page-layout.scss (92%)
 create mode 100644 ui/app/styles/core/variables.scss
 rename ui/app/styles/{core => utils}/bumper.scss (100%)
 create mode 100644 ui/app/styles/utils/reset.scss

diff --git a/ui/app/styles/components.scss b/ui/app/styles/components.scss
index cb2162c2f..f3e2a30cd 100644
--- a/ui/app/styles/components.scss
+++ b/ui/app/styles/components.scss
@@ -12,6 +12,7 @@
 @import "./components/loading-spinner";
 @import "./components/metrics";
 @import "./components/node-status-light";
+@import "./components/page-layout";
 @import "./components/simple-list";
 @import "./components/status-text";
 @import "./components/timeline";
diff --git a/ui/app/styles/core/page-layout.scss b/ui/app/styles/components/page-layout.scss
similarity index 92%
rename from ui/app/styles/core/page-layout.scss
rename to ui/app/styles/components/page-layout.scss
index 26c8de78e..d463be113 100644
--- a/ui/app/styles/core/page-layout.scss
+++ b/ui/app/styles/components/page-layout.scss
@@ -1,8 +1,3 @@
-html, body, body > .ember-view {
-  height: 100%;
-  width: 100%;
-}
-
 .page-layout {
   height: 100%;
   display: flex;
diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss
index 3021d6be0..78e76677c 100644
--- a/ui/app/styles/core.scss
+++ b/ui/app/styles/core.scss
@@ -1,47 +1,14 @@
 // Utils
+@import "./utils/reset.scss";
 @import "./utils/z-indices";
+@import "./utils/product-colors";
+@import "./utils/bumper";
 
 // Start with Bulma variables as a foundation
 @import "bulma/sass/utilities/initial-variables";
 
 // Override variables where appropriate
-@import "./utils/product-colors";
-
-$orange: #fa8e23;
-$green: #2eb039;
-$blue: $vagrant-blue;
-$purple: $terraform-purple;
-$red: #c84034;
-$grey-blue: #bbc4d1;
-
-$primary: $nomad-green;
-$warning: $orange;
-$warning-invert: $white;
-$danger: $red;
-$dark: #234;
-
-$radius: 2px;
-
-$body-size: 14px;
-$title-size: 1.75rem;
-$size-5: 1.15rem;
-$size-4: 1.3rem;
-$size-7: 0.85rem;
-
-$title-weight: $weight-semibold;
-
-$family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-  Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-
-$text: $black;
-
-$header-height: 112px;
-$gutter-width: 250px;
-
-$icon-dimensions: 1.25rem;
-$icon-dimensions-small: 1rem;
-$icon-dimensions-medium: 1.5rem;
-$icon-dimensions-large: 2.5rem;
+@import "./core/variables.scss";
 
 // Bring in the rest of Bulma
 @import "bulma/bulma";
@@ -64,7 +31,3 @@ $icon-dimensions-large: 2.5rem;
 @import "./core/tag";
 @import "./core/title";
 @import "./core/typography";
-
-// Add unique core extensions
-@import "./core/page-layout";
-@import "./core/bumper";
diff --git a/ui/app/styles/core/variables.scss b/ui/app/styles/core/variables.scss
new file mode 100644
index 000000000..6e957033e
--- /dev/null
+++ b/ui/app/styles/core/variables.scss
@@ -0,0 +1,35 @@
+$orange: #fa8e23;
+$green: #2eb039;
+$blue: $vagrant-blue;
+$purple: $terraform-purple;
+$red: #c84034;
+$grey-blue: #bbc4d1;
+
+$primary: $nomad-green;
+$warning: $orange;
+$warning-invert: $white;
+$danger: $red;
+$dark: #234;
+
+$radius: 2px;
+
+$body-size: 14px;
+$title-size: 1.75rem;
+$size-5: 1.15rem;
+$size-4: 1.3rem;
+$size-7: 0.85rem;
+
+$title-weight: $weight-semibold;
+
+$family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
+  Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+
+$text: $black;
+
+$header-height: 112px;
+$gutter-width: 250px;
+
+$icon-dimensions: 1.25rem;
+$icon-dimensions-small: 1rem;
+$icon-dimensions-medium: 1.5rem;
+$icon-dimensions-large: 2.5rem;
diff --git a/ui/app/styles/core/bumper.scss b/ui/app/styles/utils/bumper.scss
similarity index 100%
rename from ui/app/styles/core/bumper.scss
rename to ui/app/styles/utils/bumper.scss
diff --git a/ui/app/styles/utils/reset.scss b/ui/app/styles/utils/reset.scss
new file mode 100644
index 000000000..42d609252
--- /dev/null
+++ b/ui/app/styles/utils/reset.scss
@@ -0,0 +1,6 @@
+html,
+body,
+body > .ember-view {
+  height: 100%;
+  width: 100%;
+}