aboutsummaryrefslogtreecommitdiff
path: root/less/variables.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-17 15:21:38 -0700
committerMark Otto <[email protected]>2013-08-17 15:21:38 -0700
commit61caed21e2553e1be29d98bd83c8e6ac06565ecd (patch)
tree5919c94a42b48841b75eff0f1f25df44a2d90dd6 /less/variables.less
parent5ba19dc8849b1b87836404acfa8bbb336db1e496 (diff)
downloadbootstrap-61caed21e2553e1be29d98bd83c8e6ac06565ecd.tar.xz
bootstrap-61caed21e2553e1be29d98bd83c8e6ac06565ecd.zip
More consistent naming with screen size variables using xs, sm, md, and lg
Diffstat (limited to 'less/variables.less')
-rw-r--r--less/variables.less29
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));