diff options
| author | Mark Otto <[email protected]> | 2013-08-23 23:14:13 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-23 23:14:13 -0700 |
| commit | 99afaba2bfa5bcab8ee070477fba4b15db8d2af6 (patch) | |
| tree | 0044cbd39cc9927c8a48ca178b019c049520e2ca /less/variables.less | |
| parent | d5a27855459325290ace93538f5ceafb22dee27a (diff) | |
| parent | b86cd3bc3d866838127e7af15f665c70e7f50847 (diff) | |
| download | bootstrap-99afaba2bfa5bcab8ee070477fba4b15db8d2af6.tar.xz bootstrap-99afaba2bfa5bcab8ee070477fba4b15db8d2af6.zip | |
Merge pull request #10005 from twbs/deprecate-screen-device-vars
deprecate @screen-{phone,tablet,desktop} vars
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/less/variables.less b/less/variables.less index b6cd3a940..7dff919c3 100644 --- a/less/variables.less +++ b/less/variables.less @@ -207,22 +207,26 @@ // -------------------------------------------------- // Extra small screen / phone -@screen-xs: 480px;// NOTE: Deprecated in v3.0.1 in favor of @screen-xs-min +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 +@screen-xs: 480px; @screen-xs-min: @screen-xs; @screen-phone: @screen-xs-min; // Small screen / tablet -@screen-sm: 768px;// NOTE: Deprecated in v3.0.1 in favor of @screen-sm-min +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 +@screen-sm: 768px; @screen-sm-min: @screen-sm; @screen-tablet: @screen-sm-min; // Medium screen / desktop -@screen-md: 992px;// NOTE: Deprecated in v3.0.1 in favor of @screen-md-min +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 +@screen-md: 992px; @screen-md-min: @screen-md; @screen-desktop: @screen-md-min; // Large screen / wide desktop -@screen-lg: 1200px;// NOTE: Deprecated in v3.0.1 in favor of @screen-lg-min +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 +@screen-lg: 1200px; @screen-lg-min: @screen-lg; @screen-lg-desktop: @screen-lg-min; @@ -240,7 +244,7 @@ // 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; +@grid-float-breakpoint: @screen-sm; // Navbar |