diff options
| author | Jacob Thornton <[email protected]> | 2012-01-31 13:23:29 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-31 13:23:29 -0800 |
| commit | b9de88890e3db18b48ef10cd5a718002cb5dc4a0 (patch) | |
| tree | 852e83d716eb715edb6cdc44ea24ab9bb6dca294 /docs/assets/css/bootstrap-responsive.css | |
| parent | 0bfbe5058d61ae93d82b09f1dff7eb30dc22426e (diff) | |
| parent | cfc1c8a8cd69e86dc70a48766cd7cd318537dee3 (diff) | |
| download | bootstrap-b9de88890e3db18b48ef10cd5a718002cb5dc4a0.tar.xz bootstrap-b9de88890e3db18b48ef10cd5a718002cb5dc4a0.zip | |
Merge branch '2.0-wip'
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/assets/css/bootstrap-responsive.css')
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 35e96bbcd..4b032cdb5 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -12,6 +12,9 @@ visibility: hidden; } @media (max-width: 480px) { + .nav-collapse { + -webkit-transform: translate3d(0, 0, 0); + } .page-header h1 small { display: block; line-height: 18px; @@ -99,7 +102,7 @@ margin: 0; } } -@media (min-width: 768px) and (max-width: 940px) { +@media (min-width: 768px) and (max-width: 980px) { .row { margin-left: -20px; *zoom: 1; @@ -275,7 +278,7 @@ width: 714px; } } -@media (max-width: 940px) { +@media (max-width: 980px) { body { padding-top: 0; } @@ -373,10 +376,9 @@ .nav-collapse { overflow: hidden; height: 0; - -webkit-transform: translate3d(0, 0, 0); } } -@media (min-width: 940px) { +@media (min-width: 980px) { .nav-collapse.collapse { height: auto !important; } |