diff options
author | Jan Stevens <jan@playpass.be> | 2015-08-21 09:55:53 +0300 |
---|---|---|
committer | Jan Stevens <jan@playpass.be> | 2015-08-21 09:55:53 +0300 |
commit | 6e34c9d10e5285a460d85371ca093272f02641f4 (patch) | |
tree | f0a9077306d6caba79753e5433b00ae254ea509d /assets/stylesheets/bootstrap/mixins | |
parent | 66e4af2ad8251ca945a9e2a1398bc8ce2f29bdf3 (diff) |
Tracking official versions instead of v4-dev, now using v4.0.0-alpha
Diffstat (limited to 'assets/stylesheets/bootstrap/mixins')
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_grid-framework.scss | 10 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_image.scss | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss index aa5f492..ad2060c 100644 --- a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +++ b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss @@ -22,13 +22,15 @@ @include media-breakpoint-up($breakpoint) { // Work around cross-media @extend (https://github.com/sass/sass/issues/1050) %grid-column-float-#{$breakpoint} { - float: left; + @if $enable-flex { + // Do nothing + } @else { + float: left; + } } @for $i from 1 through $columns { .col-#{$breakpoint}-#{$i} { - @if not $enable-flex { - @extend %grid-column-float-#{$breakpoint}; - } + @extend %grid-column-float-#{$breakpoint}; @include make-col-span($i, $columns); } } diff --git a/assets/stylesheets/bootstrap/mixins/_image.scss b/assets/stylesheets/bootstrap/mixins/_image.scss index e5ae10a..bec9626 100644 --- a/assets/stylesheets/bootstrap/mixins/_image.scss +++ b/assets/stylesheets/bootstrap/mixins/_image.scss @@ -19,7 +19,7 @@ // Short retina mixin for setting background-image and -size. @mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) { - background-image: url($file-1x); + background-image: url("#{file-1x}"); @media only screen and (-webkit-min-device-pixel-ratio: 2), @@ -27,7 +27,7 @@ only screen and ( min-device-pixel-ratio: 2), only screen and ( min-resolution: 192dpi), only screen and ( min-resolution: 2dppx) { - background-image: url($file-2x); + background-image: url("#{file-2x}"); background-size: $width-1x $height-1x; } } |