Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master
Conflicts: dist/css/bootstrap.min.css
This commit is contained in:
commit
369f5ba760
|
@ -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 {
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue