kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

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

Browse source
This commit is contained in:
Chris Rebert 2013-08-21 12:26:20 -07:00
parent c429fd1a3c
commit 22ce649910
6 changed files with 12 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
@media screen and (min-width: @screen-tablet) {
@media screen and (min-width: @screen-sm) {
// Scale up the controls a smidge
.carousel-control .icon-prev,

4
less/forms.less
View file

@ -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;
}

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
// 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;
}

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
}
@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);

2
less/modals.less
View file

@ -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%;

10
less/variables.less
View file

@ -201,19 +201,19 @@
// Extra small screen / phone
@screen-xs: 480px;
@screen-phone: @screen-xs;
@screen-phone: @screen-xs;// NOTE: Deprecated in favor of @screen-xs
// Small screen / tablet
@screen-sm: 768px;
@screen-tablet: @screen-sm;
@screen-tablet: @screen-sm;// NOTE: Deprecated in favor of @screen-sm
// Medium screen / desktop
@screen-md: 992px;
@screen-desktop: @screen-md;
@screen-desktop: @screen-md;// NOTE: Deprecated in favor of @screen-md
// Large screen / wide desktop
@screen-lg: 1200px;
@screen-lg-desktop: @screen-lg;
@screen-lg-desktop: @screen-lg;// NOTE: Deprecated in favor of @screen-lg
// So media queries don't overlap when required, provide a maximum
@screen-xs-max: (@screen-sm - 1);
@ -229,7 +229,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