diff options
Diffstat (limited to 'scss/mixins')
| -rw-r--r-- | scss/mixins/_text-emphasis.scss | 17 | ||||
| -rw-r--r-- | scss/mixins/_utilities.scss | 8 |
2 files changed, 5 insertions, 20 deletions
diff --git a/scss/mixins/_text-emphasis.scss b/scss/mixins/_text-emphasis.scss deleted file mode 100644 index 4c68bae89e..0000000000 --- a/scss/mixins/_text-emphasis.scss +++ /dev/null @@ -1,17 +0,0 @@ -// stylelint-disable declaration-no-important - -// Typography - -@mixin text-emphasis-variant($parent, $color) { - #{$parent} { - color: $color !important; - } - @if $emphasized-link-hover-darken-percentage != 0 { - a#{$parent} { - &:hover, - &:focus { - color: darken($color, $emphasized-link-hover-darken-percentage) !important; - } - } - } -} diff --git a/scss/mixins/_utilities.scss b/scss/mixins/_utilities.scss index b5901a7dd7..4604ef537a 100644 --- a/scss/mixins/_utilities.scss +++ b/scss/mixins/_utilities.scss @@ -17,11 +17,13 @@ } // Use custom class if present - $property-class: map-get($utility, class); - $property-class: if($property-class, $property-class, nth($properties, 1)); + $property-class: if(map-has-key($utility, class), map-get($utility, class), nth($properties, 1)); + $property-class: if($property-class == null, "", $property-class); + + $infix: if($property-class == "" and str-slice($infix, 1, 1) == "-", str-slice($infix, 2), $infix); // Don't prefix if value key is null (eg. with shadow class) - $property-class-modifier: if($key, "-" + $key, ""); + $property-class-modifier: if($key, if($property-class == "" and $infix == "", "", "-") + $key, ""); .#{$property-class + $infix + $property-class-modifier} { @each $property in $properties { |