From 0aaa118bc47cfe74e6fe6008ba2c5f5431ea89d9 Mon Sep 17 00:00:00 2001
From: Kevin Ross <kevin.ross@alienfast.com>
Date: Wed, 20 Jan 2016 14:55:24 -0600
Subject: [PATCH] working with local BS4 branch (PR submitted) that flexes the
 navbar

---
 scss/.scss-lint.yml  |  1 +
 scss/_bootstrap.scss | 75 +++++++++++++++++++++++---------------------
 scss/_forms.scss     |  2 +-
 scss/_switches.scss  |  2 +-
 4 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/scss/.scss-lint.yml b/scss/.scss-lint.yml
index 88337695..f64c3e0e 100644
--- a/scss/.scss-lint.yml
+++ b/scss/.scss-lint.yml
@@ -123,6 +123,7 @@ linters:
       "flex-align",
       "flex-shrink",
       "align-items",
+      "align-self",
       "justify-content",
       "padding",
       "padding-top",
diff --git a/scss/_bootstrap.scss b/scss/_bootstrap.scss
index 6c81aee1..1ab31f0f 100644
--- a/scss/_bootstrap.scss
+++ b/scss/_bootstrap.scss
@@ -1,47 +1,50 @@
+// FIXME: temporarily use the local bootstrap - waiting on flex enable navbar https://github.com/twbs/bootstrap/pull/18976
+//@import "../bower_components/bootstrap/scss/
+
 // Core variables and mixins
-@import "../bower_components/bootstrap/scss/custom";
-@import "../bower_components/bootstrap/scss/variables";
-@import "../bower_components/bootstrap/scss/mixins";
+//@import "../../bootstrap/scss/custom";
+@import "../../bootstrap/scss/variables";
+@import "../../bootstrap/scss/mixins";
 
 // Reset and dependencies
-@import "../bower_components/bootstrap/scss/normalize";
-@import "../bower_components/bootstrap/scss/print";
+@import "../../bootstrap/scss/normalize";
+@import "../../bootstrap/scss/print";
 
 // Core CSS
-@import "../bower_components/bootstrap/scss/reboot";
-@import "../bower_components/bootstrap/scss/type";
-@import "../bower_components/bootstrap/scss/images";
-@import "../bower_components/bootstrap/scss/code";
-@import "../bower_components/bootstrap/scss/grid";
-@import "../bower_components/bootstrap/scss/tables";
-@import "../bower_components/bootstrap/scss/forms";
-@import "../bower_components/bootstrap/scss/buttons";
+@import "../../bootstrap/scss/reboot";
+@import "../../bootstrap/scss/type";
+@import "../../bootstrap/scss/images";
+@import "../../bootstrap/scss/code";
+@import "../../bootstrap/scss/grid";
+@import "../../bootstrap/scss/tables";
+@import "../../bootstrap/scss/forms";
+@import "../../bootstrap/scss/buttons";
 
 // Components
-@import "../bower_components/bootstrap/scss/animation";
-@import "../bower_components/bootstrap/scss/dropdown";
-@import "../bower_components/bootstrap/scss/button-group";
-@import "../bower_components/bootstrap/scss/input-group";
-@import "../bower_components/bootstrap/scss/custom-forms";
-@import "../bower_components/bootstrap/scss/nav";
-@import "../bower_components/bootstrap/scss/navbar";
-@import "../bower_components/bootstrap/scss/card";
-@import "../bower_components/bootstrap/scss/breadcrumb";
-@import "../bower_components/bootstrap/scss/pagination";
-@import "../bower_components/bootstrap/scss/labels";
-@import "../bower_components/bootstrap/scss/jumbotron";
-@import "../bower_components/bootstrap/scss/alert";
-@import "../bower_components/bootstrap/scss/progress";
-@import "../bower_components/bootstrap/scss/media";
-@import "../bower_components/bootstrap/scss/list-group";
-@import "../bower_components/bootstrap/scss/responsive-embed";
-@import "../bower_components/bootstrap/scss/close";
+@import "../../bootstrap/scss/animation";
+@import "../../bootstrap/scss/dropdown";
+@import "../../bootstrap/scss/button-group";
+@import "../../bootstrap/scss/input-group";
+@import "../../bootstrap/scss/custom-forms";
+@import "../../bootstrap/scss/nav";
+@import "../../bootstrap/scss/navbar";
+@import "../../bootstrap/scss/card";
+@import "../../bootstrap/scss/breadcrumb";
+@import "../../bootstrap/scss/pagination";
+@import "../../bootstrap/scss/labels";
+@import "../../bootstrap/scss/jumbotron";
+@import "../../bootstrap/scss/alert";
+@import "../../bootstrap/scss/progress";
+@import "../../bootstrap/scss/media";
+@import "../../bootstrap/scss/list-group";
+@import "../../bootstrap/scss/responsive-embed";
+@import "../../bootstrap/scss/close";
 
 // Components w/ JavaScript
-@import "../bower_components/bootstrap/scss/modal";
-@import "../bower_components/bootstrap/scss/tooltip";
-@import "../bower_components/bootstrap/scss/popover";
-@import "../bower_components/bootstrap/scss/carousel";
+@import "../../bootstrap/scss/modal";
+@import "../../bootstrap/scss/tooltip";
+@import "../../bootstrap/scss/popover";
+@import "../../bootstrap/scss/carousel";
 
 // Utility classes
-@import "../bower_components/bootstrap/scss/utilities";
+@import "../../bootstrap/scss/utilities";
diff --git a/scss/_forms.scss b/scss/_forms.scss
index 24dbb84f..9bca9bc0 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -4,7 +4,7 @@ form {
 
   // reverse the above for navbars (no help expected in a navbar form)
   .navbar & {
-    margin: 0;
+    margin-bottom: 0; // only adjust bottom so that pull-right flexed margin-left: auto works
 
     .mdb-form-group {
       display: inline-block;
diff --git a/scss/_switches.scss b/scss/_switches.scss
index 5a5b949e..a8074480 100644
--- a/scss/_switches.scss
+++ b/scss/_switches.scss
@@ -31,13 +31,13 @@
         display: block;
         width: $mdb-switch-handle-size;
         height: $mdb-switch-handle-size;
+        align-self: center;
         content: "";
         background: $mdb-switch-handle-unchecked-bg;
         border-radius: 100%;
         box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
         transition: left 0.2s ease-in, background-color 0.2s ease-in, transform 0.3s ease;
         transform: translateY(-50%);
-        align-self: center;
       }
 
       // Jelly effect on click