diff options
| author | Mark Otto <[email protected]> | 2013-08-17 22:39:07 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-17 22:39:07 -0700 |
| commit | 18766db63423e9151d1be4de061016b7a53ff8a1 (patch) | |
| tree | 07c1170429e6e22caba90d72948460f379d989e3 /less/variables.less | |
| parent | 5e31478a91e62fc022ba0141acf27937c9dd7719 (diff) | |
| parent | 04a73ebe42b8beb9567220fe31cc11057badf40f (diff) | |
| download | bootstrap-18766db63423e9151d1be4de061016b7a53ff8a1.tar.xz bootstrap-18766db63423e9151d1be4de061016b7a53ff8a1.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/less/variables.less b/less/variables.less index c3eeaaebc..a46ad4fb6 100644 --- a/less/variables.less +++ b/less/variables.less @@ -193,26 +193,25 @@ // -------------------------------------------------- // Extra small screen / phone -@screen-xsmall: 480px; -@screen-phone: @screen-xsmall; +@screen-xs: 480px; +@screen-phone: @screen-xs; // Small screen / tablet -@screen-small: 768px; -@screen-tablet: @screen-small; +@screen-sm: 768px; +@screen-tablet: @screen-sm; // Medium screen / desktop -@screen-medium: 992px; -@screen-desktop: @screen-medium; +@screen-md: 992px; +@screen-desktop: @screen-md; // Large screen / wide desktop -@screen-large: 1200px; -@screen-large-desktop: @screen-large; +@screen-lg: 1200px; +@screen-lg-desktop: @screen-lg; // So media queries don't overlap when required, provide a maximum -@screen-phone-max: (@screen-small - 1); -@screen-small-max: (@screen-medium - 1); -@screen-tablet-max: (@screen-desktop - 1); -@screen-desktop-max: (@screen-large-desktop - 1); +@screen-xs-max: (@screen-sm - 1); +@screen-sm-max: (@screen-md - 1); +@screen-md-max: (@screen-lg - 1); // Grid system @@ -600,10 +599,10 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-tablet: ((720px + @grid-gutter-width)); // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-desktop: ((940px + @grid-gutter-width)); // Large screen / wide desktop -@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg-desktop: ((1140px + @grid-gutter-width)); |