]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Remove redundant media queries (#21220)
authorStarsam80 <samraskauskas@gmail.com>
Sun, 27 Nov 2016 23:18:46 +0000 (16:18 -0700)
committerMark Otto <markd.otto@gmail.com>
Sun, 27 Nov 2016 23:18:46 +0000 (15:18 -0800)
scss/utilities/_display.scss
scss/utilities/_float.scss
scss/utilities/_spacing.scss

index a79dddbde10b432e5a72dac90e5458085d6724a7..0e386cf6fb841eba958c010cc4b61f7f113a086b 100644 (file)
@@ -8,15 +8,13 @@
     $min: breakpoint-min($breakpoint, $grid-breakpoints);
 
     @if $min {
-      @media (min-width: $min) {
-        .d-#{$breakpoint}-none { display: none !important; }
-        .d-#{$breakpoint}-inline { display: inline !important; }
-        .d-#{$breakpoint}-inline-block { display: inline-block !important; }
-        .d-#{$breakpoint}-block { display: block !important; }
-        .d-#{$breakpoint}-table { display: table !important; }
-        .d-#{$breakpoint}-table-cell { display: table-cell !important; }
-        .d-#{$breakpoint}-flex { display: flex !important; }
-      }
+      .d-#{$breakpoint}-none { display: none !important; }
+      .d-#{$breakpoint}-inline { display: inline !important; }
+      .d-#{$breakpoint}-inline-block { display: inline-block !important; }
+      .d-#{$breakpoint}-block { display: block !important; }
+      .d-#{$breakpoint}-table { display: table !important; }
+      .d-#{$breakpoint}-table-cell { display: table-cell !important; }
+      .d-#{$breakpoint}-flex { display: flex !important; }
     } @else {
       .d-none { display: none !important; }
       .d-inline { display: inline !important; }
index 99c2efdc031b0fb05d9fd12d878638ad5565436d..6c8a5dba4bcef0ba04b66d5272066178fdaf857a 100644 (file)
@@ -4,11 +4,9 @@
 
     @if $min {
       // everything else
-      @media (min-width: $min) {
-        .float-#{$breakpoint}-left { @include float-left; }
-        .float-#{$breakpoint}-right { @include float-right; }
-        .float-#{$breakpoint}-none { @include float-none; }
-      }
+      .float-#{$breakpoint}-left { @include float-left; }
+      .float-#{$breakpoint}-right { @include float-right; }
+      .float-#{$breakpoint}-none { @include float-none; }
     } @else {
       // xs
       .float-left { @include float-left; }
index 9c13b6022fc678b75e75591164c70a6ee062550a..e7248badb664c37557751659541343de91b02b36 100644 (file)
 
         @if $min {
           // everything else
-          @media (min-width: $min) {
-            .#{$abbrev}-#{$breakpoint}-#{$size} { #{$prop}:        $length-y $length-x !important; } // a = All sides
-            .#{$abbrev}t-#{$breakpoint}-#{$size} { #{$prop}-top:    $length-y !important; }
-            .#{$abbrev}r-#{$breakpoint}-#{$size} { #{$prop}-right:  $length-x !important; }
-            .#{$abbrev}b-#{$breakpoint}-#{$size} { #{$prop}-bottom: $length-y !important; }
-            .#{$abbrev}l-#{$breakpoint}-#{$size} { #{$prop}-left:   $length-x !important; }
-            .#{$abbrev}x-#{$breakpoint}-#{$size} {
-              #{$prop}-right:  $length-x !important;
-              #{$prop}-left:   $length-x !important;
-            }
-            .#{$abbrev}y-#{$breakpoint}-#{$size} {
-              #{$prop}-top:    $length-y !important;
-              #{$prop}-bottom: $length-y !important;
-            }
+          .#{$abbrev}-#{$breakpoint}-#{$size} { #{$prop}:        $length-y $length-x !important; } // a = All sides
+          .#{$abbrev}t-#{$breakpoint}-#{$size} { #{$prop}-top:    $length-y !important; }
+          .#{$abbrev}r-#{$breakpoint}-#{$size} { #{$prop}-right:  $length-x !important; }
+          .#{$abbrev}b-#{$breakpoint}-#{$size} { #{$prop}-bottom: $length-y !important; }
+          .#{$abbrev}l-#{$breakpoint}-#{$size} { #{$prop}-left:   $length-x !important; }
+          .#{$abbrev}x-#{$breakpoint}-#{$size} {
+            #{$prop}-right:  $length-x !important;
+            #{$prop}-left:   $length-x !important;
+          }
+          .#{$abbrev}y-#{$breakpoint}-#{$size} {
+            #{$prop}-top:    $length-y !important;
+            #{$prop}-bottom: $length-y !important;
           }
         } @else {
           // xs