rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-28 20:52:21 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-10-20 19:55:56 -07:00
commit 369f5ba760
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dist/css/bootstrap.css vendored
View File

@ -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 {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

3
less/navbar.less
View File

@ -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;
}