diff options
| author | Mark Otto <[email protected]> | 2013-04-28 14:27:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-04-28 14:27:58 -0700 |
| commit | 5edfdc02f26cf4432a6cd798fc0064da779d6efb (patch) | |
| tree | 8951632847de6ef68e7e7a41469b4535f4363d5a /docs/assets | |
| parent | bbee78b30b40ff0b1473a06ea7ecf5a42d51b614 (diff) | |
| parent | 227c4639e4baef95c75ff82e849c5a3621980afa (diff) | |
| download | bootstrap-5edfdc02f26cf4432a6cd798fc0064da779d6efb.tar.xz bootstrap-5edfdc02f26cf4432a6cd798fc0064da779d6efb.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5e5d325a6..5ebb752be 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3490,7 +3490,7 @@ button.close { .navbar { position: relative; - padding: 10px 15px; + padding: 0 15px; background-color: #eeeeee; border-radius: 4px; } @@ -3741,10 +3741,6 @@ button.close { } @media screen and (min-width: 768px) { - .navbar { - padding-top: 0; - padding-bottom: 0; - } .navbar-brand { float: left; margin-right: 5px; |