diff options
| author | Mark Otto <[email protected]> | 2012-01-28 18:11:31 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-28 18:11:31 -0800 |
| commit | 4fa931e403ec3ae2f8f7f690c6c4040365f68ba9 (patch) | |
| tree | b1babf3699668256e297aed08d1c3442694d77b9 /less | |
| parent | 06df91ac559686e947c3c1fbfbdd2b7dcfc5a56b (diff) | |
| download | bootstrap-4fa931e403ec3ae2f8f7f690c6c4040365f68ba9.tar.xz bootstrap-4fa931e403ec3ae2f8f7f690c6c4040365f68ba9.zip | |
fix the navbar click and a few jank responsive problems
Diffstat (limited to 'less')
| -rw-r--r-- | less/navbar.less | 4 | ||||
| -rw-r--r-- | less/responsive.less | 25 |
2 files changed, 15 insertions, 14 deletions
diff --git a/less/navbar.less b/less/navbar.less index 379cbb56d..4fd8a9073 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -21,8 +21,8 @@ display: none; float: right; padding: 7px 10px; - margin-left: 10px; - margin-right: 10px; + margin-left: 5px; + margin-right: 5px; .buttonBackground(@navbarBackgroundHighlight, @navbarBackground); @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); .box-shadow(@shadow); diff --git a/less/responsive.less b/less/responsive.less index 6c3102c14..0955710b6 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -202,7 +202,7 @@ margin-bottom: @baseLineHeight * 2; } .navbar-inner { - padding: 10px; + padding: 5px; background-image: none; } .navbar .container { @@ -210,16 +210,18 @@ } // Account for brand name .navbar .brand { - float: none; - display: block; - padding-left: 15px; - padding-right: 15px; - margin: 0; + padding-left: 10px; + padding-right: 10px; + margin: 0 0 0 -5px; + } + // Nav collapse clears brand + .navbar .nav-collapse { + clear: left; } // Block-level the nav .navbar .nav { float: none; - margin: (@baseLineHeight / 2) 0; + margin: 0 0 (@baseLineHeight / 2); } .navbar .nav > li { float: none; @@ -248,8 +250,10 @@ // Dropdowns in the navbar .navbar .dropdown-menu { position: static; - display: block; + top: auto; + left: auto; float: none; + display: block; max-width: none; margin: 0 15px; padding: 0; @@ -301,7 +305,7 @@ // LARGE DESKTOP & UP // ------------------ -/* + @media (min-width: 1210px) { // Reset grid variables @@ -317,7 +321,6 @@ .offset(@columns: 1) { margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); } - .container { width: @siteWidth; } @@ -354,7 +357,5 @@ .offset9 { .offset(9); } .offset10 { .offset(10); } .offset11 { .offset(11); } - .offset12 { .offset(12); } } -*/
\ No newline at end of file |