diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-11-14 19:22:15 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-11-14 19:22:15 +0300 |
| commit | 41ea576e9d611a9b2fffe4b1e0759ee7824858bc (patch) | |
| tree | 4579d6ccfb72620d4866e316f000f1794c0a6d77 | |
| parent | 4c09f2d7e7a3a051a6905ce5c370e1e099c11f4a (diff) | |
Split parent selector parts #763
before:
+input-size('.input-sm, .form-group-sm .form-control', ...)
after:
+input-size('.input-sm', ...)
+input-size('.form-group-sm .from-control', ...)
| -rw-r--r-- | assets/stylesheets/bootstrap/_forms.scss | 6 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/_responsive-utilities.scss | 5 | ||||
| -rw-r--r-- | tasks/converter/less_conversion.rb | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap/_forms.scss index 439657c..6449ac8 100644 --- a/assets/stylesheets/bootstrap/_forms.scss +++ b/assets/stylesheets/bootstrap/_forms.scss @@ -312,9 +312,11 @@ input[type="checkbox"] { // Build on `.form-control` with modifier classes to decrease or increase the // height and font-size of form controls. -@include input-size('.input-sm, .form-group-sm .form-control', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small); +@include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small); +@include input-size('.form-group-sm .form-control', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small); -@include input-size('.input-lg, .form-group-lg .form-control', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large); +@include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large); +@include input-size('.form-group-lg .form-control', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large); // Form control feedback states diff --git a/assets/stylesheets/bootstrap/_responsive-utilities.scss b/assets/stylesheets/bootstrap/_responsive-utilities.scss index 4d9e13b..8d02aaa 100644 --- a/assets/stylesheets/bootstrap/_responsive-utilities.scss +++ b/assets/stylesheets/bootstrap/_responsive-utilities.scss @@ -26,7 +26,10 @@ // Visibility utilities // Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0 -@include responsive-invisibility('.visible-xs, .visible-sm, .visible-md, .visible-lg'); +@include responsive-invisibility('.visible-xs'); +@include responsive-invisibility('.visible-sm'); +@include responsive-invisibility('.visible-md'); +@include responsive-invisibility('.visible-lg'); .visible-xs-block, .visible-xs-inline, diff --git a/tasks/converter/less_conversion.rb b/tasks/converter/less_conversion.rb index 91cd683..4b4bf0c 100644 --- a/tasks/converter/less_conversion.rb +++ b/tasks/converter/less_conversion.rb @@ -384,8 +384,10 @@ SASS end # unwrap, and replace @include unindent unwrap_rule_block(rule).gsub(/(@include [\w-]+)\(?([\$\w\-,\s]*)\)?/) { - args = $2 - "#{cmt}#{$1}('#{sel.gsub(/\s+/, ' ')}'#{', ' if args && !args.empty?}#{args})" + name, args = $1, $2 + sel.gsub(/\s+/, ' ').split(/,\s*/ ).map { |sel_part| + "#{cmt}#{name}('#{sel_part}'#{', ' if args && !args.empty?}#{args})" + }.join(";\n") } end end |