Skip to content

Commit 6f342d7

Browse files
committed
Merge branch 'hotfix/v3.0.0.3'
* hotfix/v3.0.0.3: Bump version to 3.0.0.3 Fixed issue in 'img-retina' mixin where 'file-1x' and 'file-2x' variables weren't being properly expanded due to enclosing quotes.
2 parents d223ac7 + ed4cb7c commit 6f342d7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

app/assets/stylesheets/twitter/bootstrap/_mixins.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@
298298
// Short retina mixin for setting background-image and -size
299299

300300
@mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
301-
background-image: image-url("$file-1x");
301+
background-image: image-url($file-1x);
302302

303303
@media
304304
only screen and (-webkit-min-device-pixel-ratio: 2),
@@ -307,7 +307,7 @@
307307
only screen and ( min-device-pixel-ratio: 2),
308308
only screen and ( min-resolution: 192dpi),
309309
only screen and ( min-resolution: 2dppx) {
310-
background-image: image-url("$file-2x");
310+
background-image: image-url($file-2x);
311311
background-size: $width-1x $height-1x;
312312
}
313313
}

lib/bootstrap/sass/rails/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module Bootstrap
22
module Sass
33
module Rails
4-
VERSION = '3.0.0.2'
4+
VERSION = '3.0.0.3'
55
end
66
end
77
end

0 commit comments

Comments
 (0)