diff options
| author | Mark Otto <[email protected]> | 2013-06-02 11:58:30 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-06-02 11:58:30 -0700 |
| commit | b62fa23d9a11c48ab7557b8a0c397c92ec106653 (patch) | |
| tree | 328bf6547c29479664c2a7b0637a6b9baeed1071 /less | |
| parent | 75db70a6c21fec96ba3fd65b16a53fde659ea97d (diff) | |
| parent | 6fda25b4c16df2d34d298b373a64ef6f41da7a5a (diff) | |
| download | bootstrap-b62fa23d9a11c48ab7557b8a0c397c92ec106653.tar.xz bootstrap-b62fa23d9a11c48ab7557b8a0c397c92ec106653.zip | |
Merge pull request #8006 from aristath/3.0.0-wip
using screen-size variables for grids
Diffstat (limited to 'less')
| -rw-r--r-- | less/grid.less | 6 | ||||
| -rw-r--r-- | less/variables.less | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/less/grid.less b/less/grid.less index 82d2a355b..6d5a8e345 100644 --- a/less/grid.less +++ b/less/grid.less @@ -39,21 +39,21 @@ // Responsive: Tablets and up @media screen and (min-width: @screen-tablet) { .container { - max-width: 728px; + max-width: @container-tablet; } } // Responsive: Desktops and up @media screen and (min-width: @screen-desktop) { .container { - max-width: 940px; + max-width: @container-desktop; } } // Responsive: Large desktops and up @media screen and (min-width: @screen-large-desktop) { .container { - max-width: 1170px; + max-width: @container-large-desktop; } } diff --git a/less/variables.less b/less/variables.less index a6c69430e..f9c32c148 100644 --- a/less/variables.less +++ b/less/variables.less @@ -403,6 +403,19 @@ @screen-large-desktop: @screen-large; +// Container sizes +// -------------------------------------------------- + +// Small screen / tablet +@container-tablet: 728px; + +// Medium screen / desktop +@container-desktop: 940px; + +// Large screen / wide desktop +@container-large-desktop: 1170px; + + // Grid system // -------------------------------------------------- |