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

Remove redundant media queries (#21220)

Browse Source
This commit is contained in:
Starsam80 2016-11-27 16:18:46 -07:00 committed by Mark Otto
parent b1e8d60348
commit 94be2d2254
3 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scss/utilities/_display.scss
View File

@ -8,15 +8,13 @@
$min: breakpoint-min($breakpoint, $grid-breakpoints); $min: breakpoint-min($breakpoint, $grid-breakpoints);
@if $min { @if $min {
@media (min-width: $min) { .d-#{$breakpoint}-none { display: none !important; }
.d-#{$breakpoint}-none { display: none !important; } .d-#{$breakpoint}-inline { display: inline !important; }
.d-#{$breakpoint}-inline { display: inline !important; } .d-#{$breakpoint}-inline-block { display: inline-block !important; }
.d-#{$breakpoint}-inline-block { display: inline-block !important; } .d-#{$breakpoint}-block { display: block !important; }
.d-#{$breakpoint}-block { display: block !important; } .d-#{$breakpoint}-table { display: table !important; }
.d-#{$breakpoint}-table { display: table !important; } .d-#{$breakpoint}-table-cell { display: table-cell !important; }
.d-#{$breakpoint}-table-cell { display: table-cell !important; } .d-#{$breakpoint}-flex { display: flex !important; }
.d-#{$breakpoint}-flex { display: flex !important; }
}
} @else { } @else {
.d-none { display: none !important; } .d-none { display: none !important; }
.d-inline { display: inline !important; } .d-inline { display: inline !important; }

8
scss/utilities/_float.scss
View File

@ -4,11 +4,9 @@
@if $min { @if $min {
// everything else // everything else
@media (min-width: $min) { .float-#{$breakpoint}-left { @include float-left; }
.float-#{$breakpoint}-left { @include float-left; } .float-#{$breakpoint}-right { @include float-right; }
.float-#{$breakpoint}-right { @include float-right; } .float-#{$breakpoint}-none { @include float-none; }
.float-#{$breakpoint}-none { @include float-none; }
}
} @else { } @else {
// xs // xs
.float-left { @include float-left; } .float-left { @include float-left; }

26
scss/utilities/_spacing.scss
View File

@ -21,20 +21,18 @@
@if $min { @if $min {
// everything else // everything else
@media (min-width: $min) { .#{$abbrev}-#{$breakpoint}-#{$size} { #{$prop}: $length-y $length-x !important; } // a = All sides
.#{$abbrev}-#{$breakpoint}-#{$size} { #{$prop}: $length-y $length-x !important; } // a = All sides .#{$abbrev}t-#{$breakpoint}-#{$size} { #{$prop}-top: $length-y !important; }
.#{$abbrev}t-#{$breakpoint}-#{$size} { #{$prop}-top: $length-y !important; } .#{$abbrev}r-#{$breakpoint}-#{$size} { #{$prop}-right: $length-x !important; }
.#{$abbrev}r-#{$breakpoint}-#{$size} { #{$prop}-right: $length-x !important; } .#{$abbrev}b-#{$breakpoint}-#{$size} { #{$prop}-bottom: $length-y !important; }
.#{$abbrev}b-#{$breakpoint}-#{$size} { #{$prop}-bottom: $length-y !important; } .#{$abbrev}l-#{$breakpoint}-#{$size} { #{$prop}-left: $length-x !important; }
.#{$abbrev}l-#{$breakpoint}-#{$size} { #{$prop}-left: $length-x !important; } .#{$abbrev}x-#{$breakpoint}-#{$size} {
.#{$abbrev}x-#{$breakpoint}-#{$size} { #{$prop}-right: $length-x !important;
#{$prop}-right: $length-x !important; #{$prop}-left: $length-x !important;
#{$prop}-left: $length-x !important; }
} .#{$abbrev}y-#{$breakpoint}-#{$size} {
.#{$abbrev}y-#{$breakpoint}-#{$size} { #{$prop}-top: $length-y !important;
#{$prop}-top: $length-y !important; #{$prop}-bottom: $length-y !important;
#{$prop}-bottom: $length-y !important;
}
} }
} @else { } @else {
// xs // xs