bg-img-variations replaced

This commit is contained in:
Kevin Ross 2015-11-04 14:41:37 -06:00
parent 23822f4b24
commit 7f940586d9
3 changed files with 21 additions and 8 deletions

View File

@ -49,8 +49,14 @@ module.exports = function(grunt) {
pattern: /.generic-variations\(unquote\(("[^"]+")\), (\$[\s\S]+?(?!\r|\n)), {$\n[\s\S]+?(?!\r|\n)box-shadow[\s\S]+?(?!\r|\n)[\s\S]+?(?!\r|\n)}\);$\n/mg,
replacement: '@include bg-box-shadow-variations(unquote($1), $2);\n',
order: 22
}
]
},
// bg-img generic-variations
{ // Multi-line replacement - https://regex101.com/r/aP2hH2/1
pattern: /.generic-variations\(unquote\(("[^"]+")\), (\$[\s\S]+?(?!\r|\n)), {$\n[\s\S]+?(?!\r|\n)background-image[\s\S]+?(?!\r|\n)[\s\S]+?(?!\r|\n)}\);$\n/mg,
replacement: '@include bg-img-variations(unquote($1), $2);\n',
order: 23
} ]
}
}
},

View File

@ -197,12 +197,7 @@ fieldset[disabled] .form-control.focus:disabled,
color: $input-info;
}
}
.generic-variations(unquote(" .form-control:focus"), $primary, {
background-image: linear-gradient($material-color, $material-color), linear-gradient($input-underline-color, $input-underline-color);
});
.generic-variations(unquote(" .form-control.focus"), $primary, {
background-image: linear-gradient($material-color, $material-color), linear-gradient($input-underline-color, $input-underline-color);
});
@include bg-img-variations(unquote(" .form-control:focus"), $primary);
@include variations(unquote(" .control-label"), color, $lightbg-text);
@include variations(unquote(" input.form-control:focus ~ .floating-label"), color, $input-default);

View File

@ -64,6 +64,16 @@
box-shadow: 0 1px 3px 1px rgba(0,0,0,0.4), 0 0 0 15px rgba($material-color, (10/100));
}
// bg-img-variations(" label input[type=checkbox]:checked + .toggle:active:after", $primary
@mixin bg-img-variations($extra, $default) {
@include generic-variations($extra, $default, "bg-img-variations-content", null);
}
@mixin bg-img-variations-content($args){
$material-color: map-get($args, material-color);
background-image: linear-gradient($material-color, $material-color), linear-gradient($input-underline-color, $input-underline-color);
}
// interpolation of mixin-name is not allowed evidently, so we statically include based on the mixin-name given
@mixin call-variations-content-mixin($args) {
@ -80,6 +90,8 @@
@include bg-color-variations-content($args);
} @else if $mixin-name == bg-box-shadow-variations-content {
@include bg-box-shadow-variations-content($args);
} @else if $mixin-name == bg-img-variations-content {
@include bg-img-variations-content($args);
} @else {
@error "Unknown mixin: #{$mixin-name}"
}