diff options
| author | Mark Otto <[email protected]> | 2013-08-11 19:06:26 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-11 19:06:26 -0700 |
| commit | ba8026e00f85f76e88a4005162612a7568a0a405 (patch) | |
| tree | 4df682ffd713e7f825914ee317bd8123bfb8c529 /dist/css/bootstrap.css | |
| parent | c2cfd3153bd181ebd05b347d04b3fff08fa1d890 (diff) | |
| download | bootstrap-ba8026e00f85f76e88a4005162612a7568a0a405.tar.xz bootstrap-ba8026e00f85f76e88a4005162612a7568a0a405.zip | |
Refactor navbars to simplify things
* `.navbar-brand` is no longer centered, thus removing need for
max-width and a few lines of code
* Clear floats of `.navbar-brand` in the `.nav-collapse` like we did in
2.x, thus simplifying some clearing and other things.
* Restyle the `.navbar-toggle` button to align it's bars up with the
text and flow of the document.
* Restyle the `.navbar-brand` to not use padding on left/right as to
avoid negative margin and other fuckery. This limits the ability to put
a bg color on the brand, but I think that's fine for now.
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 121bfdf2f..689c5f9d9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2829,10 +2829,6 @@ button.close { clear: both; } -.navbar-nav { - margin-bottom: 15px; -} - .navbar-nav > li > a { padding-top: 15px; padding-bottom: 15px; @@ -2889,6 +2885,7 @@ button.close { .nav-collapse { padding-bottom: 15px; + clear: both; } .nav-collapse:before, @@ -2926,16 +2923,12 @@ button.close { } .navbar-brand { - display: block; - max-width: 200px; - padding: 15px 15px; - margin-right: auto; - margin-left: auto; + float: left; + padding-top: 15px; + padding-bottom: 15px; font-size: 18px; - font-weight: 500; line-height: 20px; color: #777777; - text-align: center; } .navbar-brand:hover, @@ -2948,10 +2941,9 @@ button.close { .navbar-toggle { position: relative; float: right; - width: 48px; - height: 34px; - padding: 6px 12px; + padding: 9px 10px; margin-top: 8px; + margin-right: -10px; margin-bottom: 8px; background-color: transparent; border: 1px solid #dddddd; @@ -3121,12 +3113,6 @@ button.close { } @media screen and (min-width: 768px) { - .navbar-brand { - float: left; - max-width: none; - margin-right: 5px; - margin-left: -15px; - } .navbar-nav { float: left; margin-top: 0; |
