From cad79b949b060cd360582c2d208b37a51578e778 Mon Sep 17 00:00:00 2001 From: Volpeon Date: Mon, 7 Feb 2022 10:56:11 +0100 Subject: Improved font handling --- src/_functions.scss | 122 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 116 insertions(+), 6 deletions(-) (limited to 'src/_functions.scss') diff --git a/src/_functions.scss b/src/_functions.scss index a11d5f4..9f6a789 100644 --- a/src/_functions.scss +++ b/src/_functions.scss @@ -10,9 +10,7 @@ } @function foreign-color($foreign-key, $key, $tree: 'colors', $default: null, $global: true) { - $key: iro.fn-list-prepend($key, --colors); - $key: iro.fn-list-prepend($key, $foreign-key); - @return iro.props-get($key, $tree, $default, $global); + @return iro.props-get(join($foreign-key --colors, $key), $tree, $default, $global); } @function dim($key, $tree: 'dims', $default: null, $global: false) { @@ -25,7 +23,119 @@ } @function foreign-dim($foreign-key, $key, $tree: 'dims', $default: null, $global: true) { - $key: iro.fn-list-prepend($key, --dims); - $key: iro.fn-list-prepend($key, $foreign-key); - @return iro.props-get($key, $tree, $default, $global); + @return iro.props-get(join($foreign-key --dims, $key), $tree, $default, $global); +} + +@function set-font($key, $overrides: ()) { + $font: iro.props-get-static(join(--dims --font, $key), 'dims', $global: true); + + $map: (); + + @if (map-has-key($overrides, --family)) { + $map: map-merge( + $map, ( + font-family: map-get($overrides, --family) + ) + ); + } @else if (map-has-key($font, --family)) { + $map: map-merge( + $map, ( + font-family: global-dim(--font $key --family) + ) + ); + } + + @if (map-has-key($overrides, --size)) { + $map: map-merge( + $map, ( + font-size: map-get($overrides, --size) + ) + ); + } @else if (map-has-key($font, --size)) { + $map: map-merge( + $map, ( + font-size: global-dim(--font $key --size) + ) + ); + } + + @if (map-has-key($overrides, --weight)) { + $map: map-merge( + $map, ( + font-weight: map-get($overrides, --weight) + ) + ); + } @else if (map-has-key($font, --weight)) { + $map: map-merge( + $map, ( + font-weight: global-dim(--font $key --weight) + ) + ); + } + + @if (map-has-key($overrides, --style)) { + $map: map-merge( + $map, ( + font-style: map-get($overrides, --style) + ) + ); + } @else if (map-has-key($font, --style)) { + $map: map-merge( + $map, ( + font-style: global-dim(--font $key --style) + ) + ); + } + + @if (map-has-key($overrides, --line-height)) { + $map: map-merge( + $map, ( + line-height: map-get($overrides, --line-height) + ) + ); + } @else if (map-has-key($font, --line-height)) { + $map: map-merge( + $map, ( + line-height: global-dim(--font $key --line-height) + ) + ); + } + + @if (map-has-key($overrides, --transform)) { + $map: map-merge( + $map, ( + text-transform: map-get($overrides, --transform) + ) + ); + } @else if (map-has-key($font, --transform)) { + $map: map-merge( + $map, ( + text-transform: global-dim(--font $key --transform) + ) + ); + } + + @if (map-has-key($overrides, --variant-alternates)) { + $map: map-merge( + $map, ( + font-variant-alternates: map-get($overrides, --variant-alternates) + ) + ); + } @else if (map-has-key($font, --variant-alternates)) { + $map: map-merge( + $map, ( + font-variant-alternates: global-dim(--font $key --variant-alternates) + ) + ); + } + + @return $map; +} + +@mixin set-font($basis, $values: ()) { + $values: set-font($basis, $values); + + @each $prop, $value in $values { + #{$prop}: $value; + } } -- cgit v1.2.3-54-g00ecf