Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master

Conflicts: dist/css/bootstrap.min.css

Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master
Conflicts: dist/css/bootstrap.min.css
369f5ba7 · Mark Otto · dd34102c · 976f6dfd · 369f5ba7 · 369f5ba7
Commit 369f5ba7 authored Oct 20, 2013 by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

dist/css/bootstrap.css dist/css/bootstrap.css +2 -1

dist/css/bootstrap.min.css dist/css/bootstrap.min.css +1 -1

less/navbar.less less/navbar.less +2 -1

No files found.
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4413,7 +4413,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
  position: fixed;
  right: 0;
  left: 0;
-  border-width: 0 0 1px;
 }
 @media (min-width: 768px) {
@@ -4426,11 +4425,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .navbar-fixed-top {
  top: 0;
  z-index: 1030;
+  border-width: 0 0 1px;
 }
 .navbar-fixed-bottom {
  bottom: 0;
  margin-bottom: 0;
+  border-width: 1px 0 0;
 }
 .navbar-brand {

--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -128,7 +128,6 @@
  position: fixed;
  right: 0;
  left: 0;
-  border-width: 0 0 1px;
  // Undo the rounded corners
  @media (min-width: @grid-float-breakpoint) {
@@ -138,10 +137,12 @@
 .navbar-fixed-top {
  z-index: @zindex-navbar-fixed;
  top: 0;
+  border-width: 0 0 1px;
 }
 .navbar-fixed-bottom {
  bottom: 0;
  margin-bottom: 0; // override .navbar defaults
+  border-width: 1px 0 0;
 }