aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-06-21 17:21:44 -0700
committerMark Otto <[email protected]>2013-06-21 17:21:44 -0700
commitb0e943399df374b03f9ed5f676f33e42f5e53a74 (patch)
tree65017a89c27eef36f43128960fcdbe19f3dcbb7d
parenteba9b4de6c5d2dfe49ba6d2484307b1d6542620a (diff)
downloadbootstrap-b0e943399df374b03f9ed5f676f33e42f5e53a74.tar.xz
bootstrap-b0e943399df374b03f9ed5f676f33e42f5e53a74.zip
Improve alignment of navbar brand and fix up left padding on list groups
-rw-r--r--docs/assets/css/bootstrap.css5
-rw-r--r--less/list-group.less3
-rw-r--r--less/navbar.less2
3 files changed, 6 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 685e2e984..68b40ca7c 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2956,7 +2956,8 @@ input[type="button"].btn-block {
}
.list-group {
- margin: 0 0 20px;
+ padding-left: 0;
+ margin-bottom: 20px;
background-color: #ffffff;
}
@@ -3698,7 +3699,7 @@ button.close {
.navbar-brand {
float: left;
margin-right: 5px;
- margin-left: -5px;
+ margin-left: -15px;
}
.navbar-nav {
float: left;
diff --git a/less/list-group.less b/less/list-group.less
index d812cc5f9..f9d9f612c 100644
--- a/less/list-group.less
+++ b/less/list-group.less
@@ -7,7 +7,8 @@
// Easily usable on <ul>, <ol>, or <div>.
.list-group {
// No need to set list-style: none; since .list-group-item is block level
- margin: 0 0 20px; // reset all margins because ul and ol
+ margin-bottom: 20px;
+ padding-left: 0; // reset padding because ul and ol
background-color: @list-group-bg;
}
diff --git a/less/navbar.less b/less/navbar.less
index 54f4b75ab..6246bd62c 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -284,7 +284,7 @@
.navbar-brand {
float: left;
- margin-left: -5px;
+ margin-left: -15px;
margin-right: 5px;
}
.navbar-nav {