rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-02 02:29:24 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #10005 from twbs/deprecate-screen-device-vars

Browse Source 
deprecate @screen-{phone,tablet,desktop} vars
This commit is contained in:
Mark Otto 2013-08-23 23:14:13 -07:00
commit 99afaba2bf
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
less/carousel.less
View File

@ -183,7 +183,7 @@
// Scale up controls for tablets and up // 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 // Scale up the controls a smidge
.carousel-control .icon-prev, .carousel-control .icon-prev,

4
less/forms.less
View File

@ -289,7 +289,7 @@ input[type="checkbox"],
.form-inline { .form-inline {
// Kick in the inline // Kick in the inline
@media (min-width: @screen-tablet) { @media (min-width: @screen-sm) {
// Inline-block all the things for "inline" // Inline-block all the things for "inline"
.form-group { .form-group {
display: inline-block; display: inline-block;
@ -345,7 +345,7 @@ input[type="checkbox"],
} }
// Only right align form labels here when the columns stop stacking // Only right align form labels here when the columns stop stacking
@media (min-width: @screen-tablet) { @media (min-width: @screen-sm) {
.control-label { .control-label {
text-align: right; text-align: right;
} }

4
less/grid.less
View File

@ -114,7 +114,7 @@
// Note that `.col-sm-12` doesn't get floated on purpose—there's no need since // Note that `.col-sm-12` doesn't get floated on purpose—there's no need since
// it's full-width. // it's full-width.
@media (min-width: @screen-tablet) { @media (min-width: @screen-sm) {
.container { .container {
max-width: @container-tablet; max-width: @container-tablet;
} }
@ -192,7 +192,7 @@
// Note that `.col-md-12` doesn't get floated on purpose—there's no need since // Note that `.col-md-12` doesn't get floated on purpose—there's no need since
// it's full-width. // it's full-width.
@media (min-width: @screen-desktop) { @media (min-width: @screen-md) {
.container { .container {
max-width: @container-desktop; max-width: @container-desktop;
} }

2
less/jumbotron.less
View File

@ -24,7 +24,7 @@
border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container 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-top: (@jumbotron-padding * 1.6);
padding-bottom: (@jumbotron-padding * 1.6); padding-bottom: (@jumbotron-padding * 1.6);

2
less/modals.less
View File

@ -125,7 +125,7 @@
} }
// Scale up the modal // Scale up the modal
@media screen and (min-width: @screen-tablet) { @media screen and (min-width: @screen-sm) {
.modal-dialog { .modal-dialog {
left: 50%; left: 50%;

14
less/variables.less
View File

@ -207,22 +207,26 @@
// -------------------------------------------------- // --------------------------------------------------
// Extra small screen / phone // 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-xs-min: @screen-xs;
@screen-phone: @screen-xs-min; @screen-phone: @screen-xs-min;
// Small screen / tablet // 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-sm-min: @screen-sm;
@screen-tablet: @screen-sm-min; @screen-tablet: @screen-sm-min;
// Medium screen / desktop // 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-md-min: @screen-md;
@screen-desktop: @screen-md-min; @screen-desktop: @screen-md-min;
// Large screen / wide desktop // 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-min: @screen-lg;
@screen-lg-desktop: @screen-lg-min; @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 // Padding, to be divided by two and applied to the left and right of all columns
@grid-gutter-width: 30px; @grid-gutter-width: 30px;
// Point at which the navbar stops collapsing // Point at which the navbar stops collapsing
@grid-float-breakpoint: @screen-tablet; @grid-float-breakpoint: @screen-sm;
// Navbar // Navbar