navbar-brand padding more flexible, closes thomaspark#388

marceloanderson · Jan 23, 2015 · 0a7f9e5 · 0a7f9e5
1 parent 9844094
commit 0a7f9e5
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 30 deletions.
diff --git a/darkly/_bootswatch.scss b/darkly/_bootswatch.scss
@@ -26,7 +26,7 @@
   }
 
   &-brand {
-    padding: 18.5px 15px 20.5px;
+    line-height: 1;
   }
 
   &-form {

diff --git a/darkly/bootstrap.css b/darkly/bootstrap.css
@@ -2,7 +2,7 @@
 /*!
  * bootswatch v3.3.1+2
  * Homepage: http://bootswatch.com
- * Copyright 2012-2014 Thomas Park
+ * Copyright 2012-2015 Thomas Park
  * Licensed under MIT
  * Based on Bootstrap
 */
@@ -6338,7 +6338,7 @@ button.close {
   color: #00bc8c;
 }
 .navbar-brand {
-  padding: 18.5px 15px 20.5px;
+  line-height: 1;
 }
 .navbar-form .form-control {
   background-color: white;

diff --git a/darkly/bootstrap.min.css b/darkly/bootstrap.min.css
diff --git a/darkly/bootswatch.less b/darkly/bootswatch.less
@@ -26,7 +26,7 @@
   }
 
   &-brand {
-    padding: 18.5px 15px 20.5px;
+    line-height: 1;
   }
 
   &-form {

diff --git a/flatly/_bootswatch.scss b/flatly/_bootswatch.scss
@@ -26,7 +26,7 @@
   }
 
   &-brand {
-    padding: 18.5px 15px 20.5px;
+    line-height: 1;
   }
 }
 

diff --git a/flatly/bootstrap.css b/flatly/bootstrap.css
@@ -2,7 +2,7 @@
 /*!
  * bootswatch v3.3.1+2
  * Homepage: http://bootswatch.com
- * Copyright 2012-2014 Thomas Park
+ * Copyright 2012-2015 Thomas Park
  * Licensed under MIT
  * Based on Bootstrap
 */
@@ -6338,7 +6338,7 @@ button.close {
   color: #18bc9c;
 }
 .navbar-brand {
-  padding: 18.5px 15px 20.5px;
+  line-height: 1;
 }
 .btn:active {
   -webkit-box-shadow: none;

diff --git a/flatly/bootstrap.min.css b/flatly/bootstrap.min.css
diff --git a/flatly/bootswatch.less b/flatly/bootswatch.less
@@ -26,7 +26,7 @@
   }
 
   &-brand {
-    padding: 18.5px 15px 20.5px;
+    line-height: 1;
   }
 }
 

diff --git a/journal/_bootswatch.scss b/journal/_bootswatch.scss
@@ -29,7 +29,7 @@
 }
 
 .navbar-brand {
-  font-size: 18px;
+  font-size: inherit;
   font-weight: $headings-font-weight;
   text-transform: uppercase;
 }

diff --git a/journal/bootstrap.css b/journal/bootstrap.css
@@ -2,7 +2,7 @@
 /*!
  * bootswatch v3.3.1+2
  * Homepage: http://bootswatch.com
- * Copyright 2012-2014 Thomas Park
+ * Copyright 2012-2015 Thomas Park
  * Licensed under MIT
  * Based on Bootstrap
 */
@@ -6340,7 +6340,7 @@ button.close {
   color: #eb6864;
 }
 .navbar-brand {
-  font-size: 18px;
+  font-size: inherit;
   font-weight: 700;
   text-transform: uppercase;
 }

diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css
diff --git a/journal/bootswatch.less b/journal/bootswatch.less
@@ -29,7 +29,7 @@
 }
 
 .navbar-brand {
-  font-size: 18px;
+  font-size: inherit;
   font-weight: @headings-font-weight;
   text-transform: uppercase;
 }

diff --git a/readable/_bootswatch.scss b/readable/_bootswatch.scss
@@ -16,16 +16,17 @@
   }
 
   &-nav > li > a {
+    $margin-vertical: ($navbar-height - 2*$padding-base-vertical - $line-height-computed - 2px) / 2;
     padding: $padding-base-vertical $padding-base-horizontal;
-    margin: 12px 6px;
+    margin: $margin-vertical 6px;
     border: 1px solid transparent;
     border-radius: $border-radius-base;
 
     &:hover {
       border: 1px solid #ddd;
     }
   }
-
+p
   &-nav > .active > a,
   &-nav > .active > a:hover {
     border: 1px solid #ddd;
@@ -40,7 +41,9 @@
   }
 
   &-brand {
-    padding-top: 20px;
+    padding-top: ($navbar-height - 2*$font-size-large) / 2;
+    padding-bottom: ($navbar-height - 2*$font-size-large) / 2;
+    line-height: 1.9;
   }
 }
 

diff --git a/readable/bootstrap.css b/readable/bootstrap.css
@@ -2,7 +2,7 @@
 /*!
  * bootswatch v3.3.1+2
  * Homepage: http://bootswatch.com
- * Copyright 2012-2014 Thomas Park
+ * Copyright 2012-2015 Thomas Park
  * Licensed under MIT
  * Based on Bootstrap
 */
@@ -6336,14 +6336,14 @@ button.close {
 }
 .navbar-nav > li > a {
   padding: 8px 12px;
-  margin: 12px 6px;
+  margin: 12.5px 6px;
   border: 1px solid transparent;
   border-radius: 4px;
 }
 .navbar-nav > li > a:hover {
   border: 1px solid #ddd;
 }
-.navbar-nav > .active > a,
+p .navbar-nav > .active > a,
 .navbar-nav > .active > a:hover {
   border: 1px solid #ddd;
 }
@@ -6354,7 +6354,9 @@ button.close {
   color: #333333;
 }
 .navbar-brand {
-  padding-top: 20px;
+  padding-top: 12.5px;
+  padding-bottom: 12.5px;
+  line-height: 1.9;
 }
 @media (max-width: 768px) {
   .navbar .navbar-nav > li > a {

diff --git a/readable/bootstrap.min.css b/readable/bootstrap.min.css
diff --git a/readable/bootswatch.less b/readable/bootswatch.less
@@ -16,16 +16,17 @@
   }
 
   &-nav > li > a {
+    @margin-vertical: (@navbar-height - 2*@padding-base-vertical - @line-height-computed - 2px) / 2;
     padding: @padding-base-vertical @padding-base-horizontal;
-    margin: 12px 6px;
+    margin: @margin-vertical 6px;
     border: 1px solid transparent;
     border-radius: @border-radius-base;
 
     &:hover {
       border: 1px solid #ddd;
     }
   }
-
+p
   &-nav > .active > a,
   &-nav > .active > a:hover {
     border: 1px solid #ddd;
@@ -40,7 +41,9 @@
   }
 
   &-brand {
-    padding-top: 20px;
+    padding-top: (@navbar-height - 2*@font-size-large) / 2;
+    padding-bottom: (@navbar-height - 2*@font-size-large) / 2;
+    line-height: 1.9;
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ @@
       }
       &-brand {
-        padding: 18.5px 15px 20.5px;
+        line-height: 1;
       }
     }
@@ Expand Down @@