diff options
| author | Chris Rebert <[email protected]> | 2015-01-05 13:05:10 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-01-07 19:17:45 -0800 |
| commit | d6a5ebf438080a71bc78b561be20160afc12e6ec (patch) | |
| tree | cd421e057386b0b0fb6c155c4ac894fb0edefedf | |
| parent | 5951647b1ac4a770b674c38fcc689bb88c6f271b (diff) | |
| download | bootstrap-d6a5ebf438080a71bc78b561be20160afc12e6ec.tar.xz bootstrap-d6a5ebf438080a71bc78b561be20160afc12e6ec.zip | |
Remove libsass @media nesting bug workaround
https://github.com/sass/libsass/issues/185 has been fixed.
Refs #48
| -rw-r--r-- | scss/mixins/_breakpoints.scss | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/scss/mixins/_breakpoints.scss b/scss/mixins/_breakpoints.scss index 232b9416f..790bb7343 100644 --- a/scss/mixins/_breakpoints.scss +++ b/scss/mixins/_breakpoints.scss @@ -68,21 +68,9 @@ // No minimum for the smallest breakpoint, and no maximum for the largest one. // Makes the @content apply only to the given breakpoint, not viewports any wider or narrower. @mixin media-breakpoint-only($name, $breakpoints: $grid-breakpoints) { - // Nested media query combination does not work in libsass yet - // https://github.com/sass/libsass/issues/185 - // Work around until the issue is resolved: - $min: breakpoint-min($name, $breakpoints); - $max: breakpoint-max($name, $breakpoints); - @if $min and $max { - @media (min-width: $min) and (max-width: $max) { + @include media-breakpoint-up($name, $breakpoints) { + @include media-breakpoint-down($name, $breakpoints) { @content; } - } @else { - // One of min or max is a no-op, so this branch is not affected by libsass#185 - @include media-breakpoint-up($name, $breakpoints) { - @include media-breakpoint-down($name, $breakpoints) { - @content; - } - } } } |
