aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-15 00:07:23 -0700
committerMark Otto <[email protected]>2013-08-15 00:08:21 -0700
commit1b6a5bbca2595c60189ae07fc771fe3a7fc4a55f (patch)
tree0265cef43ed3ea87aabbf5096d1e8a2f4c5e8ea3 /dist/css/bootstrap.css
parent7f4e05fcce54f7d9aae64c95ecde9316345584a4 (diff)
downloadbootstrap-1b6a5bbca2595c60189ae07fc771fe3a7fc4a55f.tar.xz
bootstrap-1b6a5bbca2595c60189ae07fc771fe3a7fc4a55f.zip
fixes #9507: remove padding on navbar-collapse as any padding on an animated object screws it up; instead use some padding on the navbar nav
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css10
1 files changed, 8 insertions, 2 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 433361dd3..721f50a02 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3155,7 +3155,8 @@ button.close {
.navbar-collapse {
max-height: 340px;
- padding: 5px 15px;
+ padding-right: 15px;
+ padding-left: 15px;
overflow-x: visible;
overflow-y: auto;
border-top: 1px solid #e6e6e6;
@@ -3186,7 +3187,8 @@ button.close {
@media (min-width: 768px) {
.navbar-collapse {
width: auto;
- padding: 0;
+ padding-right: 0;
+ padding-left: 0;
border-top: 0;
box-shadow: none;
}
@@ -3284,6 +3286,8 @@ button.close {
}
.navbar-nav {
+ padding-top: 7.5px;
+ padding-bottom: 7.5px;
margin-right: -15px;
margin-left: -15px;
}
@@ -3356,6 +3360,8 @@ button.close {
@media (min-width: 768px) {
.navbar-nav {
float: left;
+ padding-top: 0;
+ padding-bottom: 0;
margin: 0;
}
.navbar-nav > li {