root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

more media query mixins

This commit is contained in:
Mark Otto 2014-09-17 21:56:27 -07:00
parent 44f948ad53
commit 47bef3c6a0
6 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
less/_carousel.less
View File

@ -219,8 +219,7 @@
// Scale up controls for tablets and up // Scale up controls for tablets and up
@media screen and (min-width: @screen-sm-min) { .media-sm({
// Scale up the controls a smidge // Scale up the controls a smidge
.carousel-control { .carousel-control {
.icon-prev, .icon-prev,
@ -249,4 +248,4 @@
.carousel-indicators { .carousel-indicators {
bottom: 20px; bottom: 20px;
} }
} });

4
less/_dropdown.less
View File

@ -192,7 +192,7 @@
// //
// Reiterate per navbar.less and the modified component alignment there. // Reiterate per navbar.less and the modified component alignment there.
@media (min-width: @grid-float-breakpoint) { .media-sm({
.navbar-right { .navbar-right {
.dropdown-menu { .dropdown-menu {
.dropdown-menu-right(); .dropdown-menu-right();
@ -203,4 +203,4 @@
.dropdown-menu-left(); .dropdown-menu-left();
} }
} }
} });

8
less/_forms.less
View File

@ -424,7 +424,7 @@ input[type="checkbox"] {
.form-inline { .form-inline {
// Kick in the inline // Kick in the inline
@media (min-width: @screen-sm-min) { .media-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;
@ -489,7 +489,7 @@ input[type="checkbox"] {
.has-feedback .form-control-feedback { .has-feedback .form-control-feedback {
top: 0; top: 0;
} }
} });
} }
@ -525,13 +525,13 @@ input[type="checkbox"] {
// Reset spacing and right align labels, but scope to media queries so that // Reset spacing and right align labels, but scope to media queries so that
// labels on narrow viewports stack the same as a default form example. // labels on narrow viewports stack the same as a default form example.
@media (min-width: @screen-sm-min) { .media-sm({
.control-label { .control-label {
text-align: right; text-align: right;
margin-bottom: 0; margin-bottom: 0;
padding-top: (@padding-base-vertical + 1); // Default padding plus a border padding-top: (@padding-base-vertical + 1); // Default padding plus a border
} }
} });
// Validation states // Validation states
// //

12
less/_grid.less
View File

@ -61,24 +61,24 @@
// Columns, offsets, pushes, and pulls for the small device range, from phones // Columns, offsets, pushes, and pulls for the small device range, from phones
// to tablets. // to tablets.
@media (min-width: @screen-sm-min) { .media-sm({
.make-grid(sm); .make-grid(sm);
} });
// Medium grid // Medium grid
// //
// Columns, offsets, pushes, and pulls for the desktop device range. // Columns, offsets, pushes, and pulls for the desktop device range.
@media (min-width: @screen-md-min) { .media-md({
.make-grid(md); .make-grid(md);
} });
// Large grid // Large grid
// //
// Columns, offsets, pushes, and pulls for the large desktop device range. // Columns, offsets, pushes, and pulls for the large desktop device range.
@media (min-width: @screen-lg-min) { .media-lg({
.make-grid(lg); .make-grid(lg);
} });

4
less/_jumbotron.less
View File

@ -27,7 +27,7 @@
border-top-color: darken(@jumbotron-bg, 10%); border-top-color: darken(@jumbotron-bg, 10%);
} }
@media (min-width: @screen-sm-min) { .media-sm({
.jumbotron { .jumbotron {
padding: (@jumbotron-padding * 1.6) 0; padding: (@jumbotron-padding * 1.6) 0;
@ -41,4 +41,4 @@
.jumbotron-heading { .jumbotron-heading {
font-size: (@font-size-base * 4.5); font-size: (@font-size-base * 4.5);
} }
} });

8
less/_modal.less
View File

@ -130,7 +130,7 @@
} }
// Scale up the modal // Scale up the modal
@media (min-width: @screen-sm-min) { .media-sm({
// Automatically set modal's width for larger viewports // Automatically set modal's width for larger viewports
.modal-dialog { .modal-dialog {
width: @modal-md; width: @modal-md;
@ -142,8 +142,8 @@
// Modal sizes // Modal sizes
.modal-sm { width: @modal-sm; } .modal-sm { width: @modal-sm; }
} });
@media (min-width: @screen-md-min) { .media-sm({
.modal-lg { width: @modal-lg; } .modal-lg { width: @modal-lg; }
} });