From c886660719aefb1edffa750b017d05b67bc9c1d0 Mon Sep 17 00:00:00 2001
From: Kevin Ross <kevin.ross@alienfast.com>
Date: Wed, 23 Dec 2015 11:58:25 -0600
Subject: [PATCH] adjust navbar vertical alignments

---
 scss/_forms.scss                   |  4 ++++
 scss/_nav.scss                     | 21 +++++++++++++++------
 scss/variables/bootstrap/_nav.scss | 16 +++++++++++-----
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/scss/_forms.scss b/scss/_forms.scss
index cef36553..36da966d 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -10,6 +10,10 @@ form {
       display: inline-block;
       padding-top: 0;
     }
+
+    .btn {
+      margin-bottom: 0;
+    }
   }
 }
 
diff --git a/scss/_nav.scss b/scss/_nav.scss
index ae032f46..02bf0fc0 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -1,25 +1,34 @@
 // https://www.google.com/design/spec/components/tabs.html#tabs-specs
 
-.nav { // base for tabs and pills
-  font-size: $mdb-nav-font-size;
-  font-weight: $mdb-nav-font-weight;
-}
-
 .nav-link {
   //line-height: $mdb-nav-link-line-height; // set baseline line-height and font sizes
   text-transform: uppercase;
 }
 
+// navbars
+.navbar-nav {
+  .nav-link {
+    padding: $mdb-navbar-link-padding;
+    font-size: $mdb-navbar-link-font-size;
+    font-weight: $mdb-navbar-link-font-weight;
+  }
+}
+
+
+// pills and tabs
 .nav-tabs,
 .nav-pills {
   border: 0;
 
   .nav-link {
-    padding: $mdb-nav-tabs-link-padding;
+    padding: $mdb-nav-tabs-pills-link-padding;
+    font-size: $mdb-nav-tabs-pills-font-size;
+    font-weight: $mdb-nav-tabs-pills-font-weight;
     border: 0;
   }
 }
 
+// tabs only
 .nav-tabs {
   .nav-link {
     border-bottom: $mdb-nav-tabs-border-size solid transparent;
diff --git a/scss/variables/bootstrap/_nav.scss b/scss/variables/bootstrap/_nav.scss
index 43bfc459..cc3b1be7 100644
--- a/scss/variables/bootstrap/_nav.scss
+++ b/scss/variables/bootstrap/_nav.scss
@@ -1,13 +1,19 @@
 // Navs https://www.google.com/design/spec/components/tabs.html#tabs-specs
 
-$mdb-nav-font-weight:                     500 !default; // $mdb-font-weight-base
-$mdb-nav-font-size:                       .875rem !default; // 14
-
 $nav-disabled-link-color:                   $gray-light !default;
 $nav-disabled-link-hover-color:             $gray-light !default;
 
-// tabs
-$mdb-nav-tabs-link-padding:                 1.4286em .8575em !default; // spec // was .5em 1em   // relative em based on 14
+$mdb-navbar-link-font-weight:               $mdb-font-weight-base !default; //
+$mdb-navbar-link-font-size:                 .875rem !default; // 14
+$mdb-navbar-link-padding:                   .5321rem 0; // 7
+
+
+// tabs & pills
+$mdb-nav-tabs-pills-font-weight:            500 !default; //
+$mdb-nav-tabs-pills-font-size:              .875rem !default; // 14
+$mdb-nav-tabs-pills-link-padding:           1.4286em .8575em !default; // spec // was .5em 1em   // relative em based on 14
+
+// tabs only
 $mdb-nav-tabs-border-size:                  .214rem !default; // 3px
 
 $mdb-nav-tabs-color:                        $gray !default;