Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deprecate @screen-{phone,tablet,desktop} vars #10005

Merged
merged 2 commits into from
Aug 24, 2013
Merged

deprecate @screen-{phone,tablet,desktop} vars #10005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22ce649
deprecate @screen-{phone,tablet,desktop} vars
cvrebert Aug 21, 2013
b86cd3b
Merge branch 'master' into deprecate-screen-device-vars
mdo Aug 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion less/carousel.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions less/forms.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions less/grid.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion less/jumbotron.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion less/modals.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
Expand Down
14 changes: 9 additions & 5 deletions less/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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
Expand Down