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

Merge pull request #10569 from ZDroid/patch-2

Browse Source 
Change @screen-* to @screen-*-min
This commit is contained in:
Mark Otto 2013-09-11 23:07:47 -07:00
commit 9c0d04d3e4
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
less/carousel.less
View File

@ -190,7 +190,7 @@
// Scale up controls for tablets and up
@media screen and (min-width: @screen-sm) {
@media screen and (min-width: @screen-sm-min) {
// Scale up the controls a smidge
.carousel-control {

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-sm) {
@media (min-width: @screen-sm-min) {
.container {
width: @container-sm;
}
@ -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-md) {
@media (min-width: @screen-md-min) {
.container {
width: @container-md;
}

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-sm) {
@media screen and (min-width: @screen-sm-min) {
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-sm) {
@media screen and (min-width: @screen-sm-min) {
.modal-dialog {
width: 600px;

2
less/type.less
View File

@ -15,7 +15,7 @@ p {
font-weight: 200;
line-height: 1.4;
@media (min-width: @screen-sm) {
@media (min-width: @screen-sm-min) {
font-size: (@font-size-base * 1.5);
}
}