diff options
| author | Mark Otto <[email protected]> | 2013-07-30 14:14:51 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-30 14:14:51 -0700 |
| commit | e6ac348bfc965890ae58f9a052fbe715c52b777d (patch) | |
| tree | 7b3fec436fdb099fed4bd42365ddf2a7f3dee665 /less/variables.less | |
| parent | 96eef43deea6d923f508875d509f46cff7b84146 (diff) | |
| parent | e0395b425d0a31d3cecda0793fcc2d0bb84ed8fb (diff) | |
| download | bootstrap-e6ac348bfc965890ae58f9a052fbe715c52b777d.tar.xz bootstrap-e6ac348bfc965890ae58f9a052fbe715c52b777d.zip | |
Merge pull request #8726 from andreypopp/3.0.0-wip
Fix out of order variable declaration order
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 68 |
1 files changed, 33 insertions, 35 deletions
diff --git a/less/variables.less b/less/variables.less index 878725f6c..71e813d32 100644 --- a/less/variables.less +++ b/less/variables.less @@ -174,6 +174,39 @@ @zindex-modal-background: 1040; @zindex-modal: 1050; +// Media queries breakpoints +// -------------------------------------------------- + +// Tiny screen / phone +@screen-tiny: 480px; +@screen-phone: @screen-tiny; + +// Small screen / tablet +@screen-small: 768px; +@screen-tablet: @screen-small; + +// Medium screen / desktop +@screen-medium: 992px; +@screen-desktop: @screen-medium; + +// So media queries don't overlap when required, provide a maximum +@screen-small-max: (@screen-medium - 1); +@screen-tablet-max: @screen-small-max; + +// Large screen / wide desktop +@screen-large: 1200px; +@screen-large-desktop: @screen-large; + +// Grid system +// -------------------------------------------------- + +// Number of columns in the grid system +@grid-columns: 12; +// Padding, to be divided by two and applied to the left and right of all columns +@grid-gutter-width: 30px; +// Point at which the navbar stops collapsing +@grid-float-breakpoint: @screen-tablet; + // Navbar // ------------------------- @@ -520,30 +553,6 @@ @component-offset-horizontal: 180px; -// Media queries breakpoints -// -------------------------------------------------- - -// Tiny screen / phone -@screen-tiny: 480px; -@screen-phone: @screen-tiny; - -// Small screen / tablet -@screen-small: 768px; -@screen-tablet: @screen-small; - -// Medium screen / desktop -@screen-medium: 992px; -@screen-desktop: @screen-medium; - -// So media queries don't overlap when required, provide a maximum -@screen-small-max: (@screen-medium - 1); -@screen-tablet-max: @screen-small-max; - -// Large screen / wide desktop -@screen-large: 1200px; -@screen-large-desktop: @screen-large; - - // Container sizes // -------------------------------------------------- @@ -555,14 +564,3 @@ // Large screen / wide desktop @container-large-desktop: 1170px; - - -// Grid system -// -------------------------------------------------- - -// Number of columns in the grid system -@grid-columns: 12; -// Padding, to be divided by two and applied to the left and right of all columns -@grid-gutter-width: 30px; -// Point at which the navbar stops collapsing -@grid-float-breakpoint: @screen-tablet; |