From 68eb506687ec8297dff25ca389aec253b3a3432b Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Tue, 26 Jun 2018 01:32:32 -0700
Subject: [PATCH] Organize grid styles

---
 ui/src/style/pages/kapacitor.scss |  6 ---
 ui/src/style/theme/_grid.scss     | 67 ++++++++++++++++++++++++++++++-
 ui/src/style/unsorted.scss        | 59 ---------------------------
 3 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/ui/src/style/pages/kapacitor.scss b/ui/src/style/pages/kapacitor.scss
index 443b05ce3d..63447b40ac 100644
--- a/ui/src/style/pages/kapacitor.scss
+++ b/ui/src/style/pages/kapacitor.scss
@@ -551,12 +551,6 @@ $rule-builder--radius-lg: 5px;
     padding-bottom: $rule-builder--padding-lg;
   }
 }
-.endpoint-tab--parameters .faux-form {
-  margin-left: -6px;
-  margin-right: -6px;
-  width: calc(100% + 12px);
-  display: inline-block;
-}
 .endpoint-tab--parameters--empty {
   align-items: center;
   justify-content: center;
diff --git a/ui/src/style/theme/_grid.scss b/ui/src/style/theme/_grid.scss
index a6703e8016..23c7169bf9 100644
--- a/ui/src/style/theme/_grid.scss
+++ b/ui/src/style/theme/_grid.scss
@@ -43,7 +43,7 @@ $grid--col-12: 100%;
 }
 
 .form-group-submit {
-  margin-top: 30px;
+  margin-top: 22px;
 }
 
 .col {
@@ -220,3 +220,68 @@ $grid--col-12: 100%;
     &-11 { margin-left: $grid--col-11; }
   }
 }
+
+//  Wrapp form sets to ensure proper spacing
+//  ----------------------------------------------------------------------------
+div.faux-form {
+  width: calc(100% + 12px);
+  margin-left: -6px;
+  margin-right: -6px;
+  display: inline-block;
+
+  .form-group.col-xs-1,
+  .form-group.col-xs-2,
+  .form-group.col-xs-3,
+  .form-group.col-xs-4,
+  .form-group.col-xs-5,
+  .form-group.col-xs-6,
+  .form-group.col-xs-7,
+  .form-group.col-xs-8,
+  .form-group.col-xs-9,
+  .form-group.col-xs-10,
+  .form-group.col-xs-11,
+  .form-group.col-xs-12,
+  .form-group.col-sm-1,
+  .form-group.col-sm-2,
+  .form-group.col-sm-3,
+  .form-group.col-sm-4,
+  .form-group.col-sm-5,
+  .form-group.col-sm-6,
+  .form-group.col-sm-7,
+  .form-group.col-sm-8,
+  .form-group.col-sm-9,
+  .form-group.col-sm-10,
+  .form-group.col-sm-11,
+  .form-group.col-sm-12,
+  .form-group.col-md-1,
+  .form-group.col-md-2,
+  .form-group.col-md-3,
+  .form-group.col-md-4,
+  .form-group.col-md-5,
+  .form-group.col-md-6,
+  .form-group.col-md-7,
+  .form-group.col-md-8,
+  .form-group.col-md-9,
+  .form-group.col-md-10,
+  .form-group.col-md-11,
+  .form-group.col-md-12,
+  .form-group.col-lg-1,
+  .form-group.col-lg-2,
+  .form-group.col-lg-3,
+  .form-group.col-lg-4,
+  .form-group.col-lg-5,
+  .form-group.col-lg-6,
+  .form-group.col-lg-7,
+  .form-group.col-lg-8,
+  .form-group.col-lg-9,
+  .form-group.col-lg-10,
+  .form-group.col-lg-11,
+  .form-group.col-lg-12 {
+    padding-left: 6px;
+    padding-right: 6px;
+  }
+
+  > *:last-child {
+    margin-bottom: 0;
+  }
+}
diff --git a/ui/src/style/unsorted.scss b/ui/src/style/unsorted.scss
index 779282e25d..1daf427fea 100644
--- a/ui/src/style/unsorted.scss
+++ b/ui/src/style/unsorted.scss
@@ -484,65 +484,6 @@ $dash-editable-header-padding: 7px;
   }
 }
 
-/*
-  Fake form padding without <form>
-
-*/
-
-div.faux-form {
-  .form-group.col-xs-1,
-  .form-group.col-xs-2,
-  .form-group.col-xs-3,
-  .form-group.col-xs-4,
-  .form-group.col-xs-5,
-  .form-group.col-xs-6,
-  .form-group.col-xs-7,
-  .form-group.col-xs-8,
-  .form-group.col-xs-9,
-  .form-group.col-xs-10,
-  .form-group.col-xs-11,
-  .form-group.col-xs-12,
-  .form-group.col-sm-1,
-  .form-group.col-sm-2,
-  .form-group.col-sm-3,
-  .form-group.col-sm-4,
-  .form-group.col-sm-5,
-  .form-group.col-sm-6,
-  .form-group.col-sm-7,
-  .form-group.col-sm-8,
-  .form-group.col-sm-9,
-  .form-group.col-sm-10,
-  .form-group.col-sm-11,
-  .form-group.col-sm-12,
-  .form-group.col-md-1,
-  .form-group.col-md-2,
-  .form-group.col-md-3,
-  .form-group.col-md-4,
-  .form-group.col-md-5,
-  .form-group.col-md-6,
-  .form-group.col-md-7,
-  .form-group.col-md-8,
-  .form-group.col-md-9,
-  .form-group.col-md-10,
-  .form-group.col-md-11,
-  .form-group.col-md-12,
-  .form-group.col-lg-1,
-  .form-group.col-lg-2,
-  .form-group.col-lg-3,
-  .form-group.col-lg-4,
-  .form-group.col-lg-5,
-  .form-group.col-lg-6,
-  .form-group.col-lg-7,
-  .form-group.col-lg-8,
-  .form-group.col-lg-9,
-  .form-group.col-lg-10,
-  .form-group.col-lg-11,
-  .form-group.col-lg-12 {
-    padding-left: 6px;
-    padding-right: 6px;
-  }
-}
-
 /*
   Stretch to fit Dropdowns
   -----------------------------------------------------------------------------