diff options
| author | Mark Otto <[email protected]> | 2013-01-16 14:48:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-01-16 14:48:25 -0800 |
| commit | cf693b56321c457ce35e1ebb72a2a5f3606fc563 (patch) | |
| tree | 5189c3683751ce11321ec0ba6df4471617f9370d | |
| parent | 13a80f33c80bf8823b1d3addcfdb990ff42409ec (diff) | |
| download | bootstrap-cf693b56321c457ce35e1ebb72a2a5f3606fc563.tar.xz bootstrap-cf693b56321c457ce35e1ebb72a2a5f3606fc563.zip | |
Add in responsive for 1200px+ layout; increase padding for that viewport size
| -rw-r--r-- | docs/assets/css/bootstrap.css | 13 | ||||
| -rw-r--r-- | docs/assets/css/docs.css | 5 | ||||
| -rw-r--r-- | less/bootstrap.less | 15 | ||||
| -rw-r--r-- | less/grid.less | 1 |
4 files changed, 28 insertions, 6 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2195adde9..b5cea261d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -688,7 +688,6 @@ pre code { } .container { - max-width: 940px; margin-right: auto; margin-left: auto; } @@ -4706,8 +4705,6 @@ a.badge:hover { } .container { max-width: 940px; - margin-right: auto; - margin-left: auto; } .navbar { padding-top: 0; @@ -4740,6 +4737,16 @@ a.badge:hover { } } +@media screen and (min-width: 1200px) { + .container { + max-width: 1170px; + } + [class^="span"] { + padding-right: 15px; + padding-left: 15px; + } +} + /* // Responsive // ------------------------------------------------------------- diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 32b09a805..36e5e70ce 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -213,6 +213,11 @@ section > ul li { } } +@media screen and (min-width: 1200px) { + .bs-docs-sidenav { + width: 260px; + } +} diff --git a/less/bootstrap.less b/less/bootstrap.less index 896a91641..a0a2e868a 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -88,8 +88,6 @@ */ .container { max-width: 940px; - margin-left: auto; - margin-right: auto; } .navbar { @@ -126,6 +124,19 @@ } +// Responsive: Large desktops and up +@media screen and (min-width: 1200px) { + + .container { + max-width: 1170px; + } + [class^="span"] { + padding-left: 15px; + padding-right: 15px; + } + +} + /* // Responsive // ------------------------------------------------------------- diff --git a/less/grid.less b/less/grid.less index 751e9d8c6..b8c1c3beb 100644 --- a/less/grid.less +++ b/less/grid.less @@ -6,7 +6,6 @@ // Set the container width, and override it for fixed navbars in media queries .container { .container-fixed(); - max-width: 940px; } // Mobile-first defaults |