From: Mark Otto <otto@github.com>
Date: Sat, 24 Aug 2013 05:56:23 +0000 (-0700)
Subject: Merge branch 'master' into deprecate-screen-device-vars
X-Git-Tag: v3.0.1~144^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10005%2Fhead;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into deprecate-screen-device-vars

Conflicts:
	less/variables.less
---

b86cd3bc3d866838127e7af15f665c70e7f50847
diff --cc less/variables.less
index b2547493aa,b6cd3a940c..7dff919c39
--- a/less/variables.less
+++ b/less/variables.less
@@@ -200,25 -207,29 +207,33 @@@
  // --------------------------------------------------
  
  // 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-phone:               @screen-xs;// NOTE: Deprecated in favor of @screen-xs
+ @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-tablet:              @screen-sm;// NOTE: Deprecated in favor of @screen-sm
+ @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-desktop:             @screen-md;// NOTE: Deprecated in favor of @screen-md
+ @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-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