mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch 'master' of github.com:twbs/bootstrap

Browse Source
This commit is contained in:
Mark Otto
2013-10-20 22:43:03 -07:00
parent d8fab5aa6e 98378d2d88
commit 6ecb5d6cf3
5 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+2 -2
View File
@@ -4266,7 +4266,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar {
position: relative;
z-index: 1000;
min-height: 50px;
margin-bottom: 20px;
border: 1px solid transparent;
@@ -4399,6 +4398,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.navbar-static-top {
z-index: 1000;
border-width: 0 0 1px;
}
@@ -4413,6 +4413,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
position: fixed;
right: 0;
left: 0;
z-index: 1030;
}
@media (min-width: 768px) {
@@ -4424,7 +4425,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-fixed-top {
top: 0;
z-index: 1030;
border-width: 0 0 1px;
}
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long