diff options
| -rw-r--r-- | less/carousel.less | 2 | ||||
| -rw-r--r-- | less/forms.less | 4 | ||||
| -rw-r--r-- | less/grid.less | 4 | ||||
| -rw-r--r-- | less/jumbotron.less | 2 | ||||
| -rw-r--r-- | less/modals.less | 2 | ||||
| -rw-r--r-- | less/variables.less | 14 |
6 files changed, 16 insertions, 12 deletions
diff --git a/less/carousel.less b/less/carousel.less index c468d435c..de5e4c936 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -183,7 +183,7 @@ // Scale up controls for tablets and up -@media screen and (min-width: @screen-tablet) { +@media screen and (min-width: @screen-sm) { // Scale up the controls a smidge .carousel-control .icon-prev, diff --git a/less/forms.less b/less/forms.less index f87b60276..a02df1e3d 100644 --- a/less/forms.less +++ b/less/forms.less @@ -289,7 +289,7 @@ input[type="checkbox"], .form-inline { // Kick in the inline - @media (min-width: @screen-tablet) { + @media (min-width: @screen-sm) { // Inline-block all the things for "inline" .form-group { display: inline-block; @@ -345,7 +345,7 @@ input[type="checkbox"], } // Only right align form labels here when the columns stop stacking - @media (min-width: @screen-tablet) { + @media (min-width: @screen-sm) { .control-label { text-align: right; } diff --git a/less/grid.less b/less/grid.less index 44e38994e..d3a3cf6bc 100644 --- a/less/grid.less +++ b/less/grid.less @@ -114,7 +114,7 @@ // Note that `.col-sm-12` doesn't get floated on purpose—there's no need since // it's full-width. -@media (min-width: @screen-tablet) { +@media (min-width: @screen-sm) { .container { max-width: @container-tablet; } @@ -192,7 +192,7 @@ // Note that `.col-md-12` doesn't get floated on purpose—there's no need since // it's full-width. -@media (min-width: @screen-desktop) { +@media (min-width: @screen-md) { .container { max-width: @container-desktop; } diff --git a/less/jumbotron.less b/less/jumbotron.less index 8f482af52..53289fb2c 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -24,7 +24,7 @@ border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container } - @media screen and (min-width: @screen-tablet) { + @media screen and (min-width: @screen-sm) { padding-top: (@jumbotron-padding * 1.6); padding-bottom: (@jumbotron-padding * 1.6); diff --git a/less/modals.less b/less/modals.less index 7bc6c314f..f886fb25c 100644 --- a/less/modals.less +++ b/less/modals.less @@ -125,7 +125,7 @@ } // Scale up the modal -@media screen and (min-width: @screen-tablet) { +@media screen and (min-width: @screen-sm) { .modal-dialog { left: 50%; 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 |