kotovalexarian-likes-github/twbs--bootstrap-sass
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap-sass.git synced 2022-11-09 12:27:02 -05:00
Code Releases Activity

make +scale(one_argument) compatible with Sass list handling. See #518

Browse source
This commit is contained in:
Gleb Mazovetskiy 2014-02-02 13:18:39 +01:00
parent 652a295354
commit 2bf8f22ab8
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/bootstrap-sass/version.rb
View file

@ -1,4 +1,4 @@
module Bootstrap module Bootstrap
VERSION = '3.1.0.0' VERSION = '3.1.0.0'
BOOTSTRAP_SHA = '362708acdd1f75bf5ccbcd98dfbb5e005297921b' BOOTSTRAP_SHA = '9c054fd4c0db89cbbb1df3c868bafc4f2c17c3e3'
end end

5
tasks/converter/less_conversion.rb
View file

@ -75,6 +75,11 @@ class Converter
file = replace_rules(file, ' .list-group-item-') { |rule| extract_nested_rule rule, 'a&' } file = replace_rules(file, ' .list-group-item-') { |rule| extract_nested_rule rule, 'a&' }
file = replace_all file, /,\s*\.open \.dropdown-toggle& \{(.*?)\}/m, file = replace_all file, /,\s*\.open \.dropdown-toggle& \{(.*?)\}/m,
" {\\1}\n .open & { &.dropdown-toggle {\\1} }" " {\\1}\n .open & { &.dropdown-toggle {\\1} }"
# make +scale(one_argument) compatible with Sass list handling
# see https://github.com/twbs/bootstrap-sass/issues/518
file = replace_all file, '$ratio, $ratio-y', '$scale-args'
file = convert_grid_mixins file file = convert_grid_mixins file
when 'responsive-utilities.less' when 'responsive-utilities.less'
file = apply_mixin_parent_selector(file, '&\.(visible|hidden)') file = apply_mixin_parent_selector(file, '&\.(visible|hidden)')

8
vendor/assets/stylesheets/bootstrap/_mixins.scss vendored
View file

@ -154,10 +154,10 @@
-ms-transform: rotate($degrees); // IE9 only -ms-transform: rotate($degrees); // IE9 only
transform: rotate($degrees); transform: rotate($degrees);
} }
@mixin scale($ratio, $ratio-y...) { @mixin scale($scale-args...) {
-webkit-transform: scale($ratio, $ratio-y); -webkit-transform: scale($scale-args);
-ms-transform: scale($ratio, $ratio-y); // IE9 only -ms-transform: scale($scale-args); // IE9 only
transform: scale($ratio, $ratio-y); transform: scale($scale-args);
} }
@mixin translate($x, $y) { @mixin translate($x, $y) {
-webkit-transform: translate($x, $y); -webkit-transform: translate($x, $y);