diff options
| author | Mark Otto <[email protected]> | 2013-08-23 22:56:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-23 22:56:23 -0700 |
| commit | b86cd3bc3d866838127e7af15f665c70e7f50847 (patch) | |
| tree | 0044cbd39cc9927c8a48ca178b019c049520e2ca /less/variables.less | |
| parent | 22ce6499102c2ab87bbd8a303b5d26531c6e7df2 (diff) | |
| parent | d5a27855459325290ace93538f5ceafb22dee27a (diff) | |
| download | bootstrap-b86cd3bc3d866838127e7af15f665c70e7f50847.tar.xz bootstrap-b86cd3bc3d866838127e7af15f665c70e7f50847.zip | |
Merge branch 'master' into deprecate-screen-device-vars
Conflicts:
less/variables.less
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/less/variables.less b/less/variables.less index b2547493a..7dff919c3 100644 --- a/less/variables.less +++ b/less/variables.less @@ -48,6 +48,13 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-h1: floor(@font-size-base * 2.60); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.70); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px @@ -200,25 +207,33 @@ // -------------------------------------------------- // Extra small screen / phone +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 @screen-xs: 480px; -@screen-phone: @screen-xs;// NOTE: Deprecated in favor of @screen-xs +@screen-xs-min: @screen-xs; +@screen-phone: @screen-xs-min; // Small screen / tablet +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 @screen-sm: 768px; -@screen-tablet: @screen-sm;// NOTE: Deprecated in favor of @screen-sm +@screen-sm-min: @screen-sm; +@screen-tablet: @screen-sm-min; // Medium screen / desktop +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 @screen-md: 992px; -@screen-desktop: @screen-md;// NOTE: Deprecated in favor of @screen-md +@screen-md-min: @screen-md; +@screen-desktop: @screen-md-min; // Large screen / wide desktop +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 @screen-lg: 1200px; -@screen-lg-desktop: @screen-lg;// NOTE: Deprecated in favor of @screen-lg +@screen-lg-min: @screen-lg; +@screen-lg-desktop: @screen-lg-min; // So media queries don't overlap when required, provide a maximum -@screen-xs-max: (@screen-sm - 1); -@screen-sm-max: (@screen-md - 1); -@screen-md-max: (@screen-lg - 1); +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); // Grid system |