diff options
| author | Mark Otto <[email protected]> | 2012-01-08 03:00:06 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-08 03:00:06 -0800 |
| commit | b7acbd8476060bc1f2da9837693b0b86b68423c5 (patch) | |
| tree | 0ce8b95fb9e279a28b032d9bc6229a89f6c523bb /bootstrap.css | |
| parent | 9e7acc637057292205906edc99fb23a49c937afa (diff) | |
| download | bootstrap-b7acbd8476060bc1f2da9837693b0b86b68423c5.tar.xz bootstrap-b7acbd8476060bc1f2da9837693b0b86b68423c5.zip | |
move collapsing navbar nav to 480 and below, unfloat nav for 768 and below to wrap links with position absolute
Diffstat (limited to 'bootstrap.css')
| -rw-r--r-- | bootstrap.css | 102 |
1 files changed, 54 insertions, 48 deletions
diff --git a/bootstrap.css b/bootstrap.css index 57acf8775..a9a104ccc 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Jan 8 02:30:05 PST 2012 + * Date: Sun Jan 8 02:58:37 PST 2012 */ html, body { margin: 0; @@ -3007,53 +3007,6 @@ a.thumbnail:hover { visibility: hidden; } @media (max-width: 480px) { - .modal { - width: auto; - margin: 0; - } - .modal.fade.in { - top: auto; - } - .horizontal-form .control-group > label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .horizontal-form .controls { - margin-left: 0; - } - .horizontal-form .control-list { - padding-top: 0; - } - .horizontal-form .form-actions { - padding-left: 0; - } - .modal { - position: fixed; - top: 20px; - left: 20px; - right: 20px; - width: auto; - } - .modal .close { - padding: 10px; - } -} -@media (max-width: 768px) { - .container { - width: auto; - padding: 0 20px; - } - .row { - margin-left: 0; - } - .row > [class*="span"] { - float: none; - display: block; - width: auto; - margin: 0; - } .navbar .nav { position: absolute; top: 0; @@ -3109,6 +3062,59 @@ a.thumbnail:hover { .navbar .nav:hover > li > a:hover { background-color: #333; } + .modal { + width: auto; + margin: 0; + } + .modal.fade.in { + top: auto; + } + .horizontal-form .control-group > label { + float: none; + width: auto; + padding-top: 0; + text-align: left; + } + .horizontal-form .controls { + margin-left: 0; + } + .horizontal-form .control-list { + padding-top: 0; + } + .horizontal-form .form-actions { + padding-left: 0; + } + .modal { + position: fixed; + top: 20px; + left: 20px; + right: 20px; + width: auto; + } + .modal .close { + padding: 10px; + } +} +@media (max-width: 768px) { + .navbar-fixed { + position: absolute; + } + .navbar-fixed .nav { + float: none; + } + .container { + width: auto; + padding: 0 20px; + } + .row { + margin-left: 0; + } + .row > [class*="span"] { + float: none; + display: block; + width: auto; + margin: 0; + } } @media (min-width: 768px) and (max-width: 940px) { .container { |
