From b03668dacf4a7412012b656e5622b21b2c9023f3 Mon Sep 17 00:00:00 2001 From: Michael Buchholz Date: Fri, 14 Jul 2023 14:34:30 +0200 Subject: [PATCH 1/4] fix pressed selected chip border --- .../src/components/mw-chip/mw-chip.css | 2 +- mwui-token-farm/input/MW_component.json | 102 +++++++++--------- mwui-token-farm/input/MW_core.json | 102 +++++++++--------- mwui-token-farm/input/MW_semantic_light.json | 102 +++++++++--------- 4 files changed, 163 insertions(+), 145 deletions(-) diff --git a/mwui-stencil/src/components/mw-chip/mw-chip.css b/mwui-stencil/src/components/mw-chip/mw-chip.css index ba329d22..0ad43b15 100644 --- a/mwui-stencil/src/components/mw-chip/mw-chip.css +++ b/mwui-stencil/src/components/mw-chip/mw-chip.css @@ -78,7 +78,7 @@ .chip:active:not(.selected):not(.disabled) { color: var(--mw-component-chips-color-fg-default); background: var(--mw-component-chips-color-bg-pressed); - + box-shadow: inset 0 0 0 var(--mw-component-chips-border-width-default) var(--mw-component-chips-color-border-default); } /* disabled */ diff --git a/mwui-token-farm/input/MW_component.json b/mwui-token-farm/input/MW_component.json index c1fd041b..44e6b5c2 100644 --- a/mwui-token-farm/input/MW_component.json +++ b/mwui-token-farm/input/MW_component.json @@ -257,7 +257,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "md": { @@ -271,7 +271,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 16, @@ -289,7 +289,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 20, @@ -307,7 +307,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -331,7 +331,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "color": { @@ -402,7 +402,7 @@ } } }, - "toggle-switch": { + "switch": { "defaultW": { "value": 52, "type": "sizing" @@ -413,13 +413,13 @@ } }, "controls": { - "checkbox-radiobutton": { + "checkbox-radio": { "container": { "value": 24, "type": "sizing" } }, - "radiobutton": { + "radio": { "outline": { "value": 20, "type": "sizing" @@ -637,6 +637,12 @@ "value": "2px", "type": "borderWidth" } + }, + "margin": { + "marginLeft": { + "value": 32, + "type": "spacing" + } } }, "checkbox": { @@ -679,7 +685,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } } }, @@ -699,7 +705,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "helperText": { @@ -717,7 +723,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "text": { @@ -735,7 +741,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "fg": { @@ -885,7 +891,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "uppercase", @@ -958,7 +964,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle": { @@ -976,7 +982,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "borderRadius": { @@ -1056,7 +1062,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle": { @@ -1074,7 +1080,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "borderRadius": { @@ -1267,7 +1273,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 14, @@ -1376,7 +1382,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 10, @@ -1394,7 +1400,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 14, @@ -1412,7 +1418,7 @@ }, "lineHeight": { "value": 48, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -1430,7 +1436,7 @@ }, "lineHeight": { "value": 48, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 32, @@ -1643,7 +1649,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "title": { @@ -1661,7 +1667,7 @@ }, "lineHeight": { "value": 36, - "type": "lineHeights" + "type": "lineHeight" } }, "subhead": { @@ -1679,7 +1685,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle": { @@ -1697,7 +1703,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "metadata": { @@ -1715,7 +1721,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "fg": { @@ -1869,7 +1875,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "fg": { @@ -1931,7 +1937,7 @@ }, "lineHeight": { "value": 36, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -1965,7 +1971,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 14, @@ -2036,7 +2042,7 @@ }, "lineHeight": { "value": 48, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -2056,7 +2062,7 @@ }, "lineHeight": { "value": 60, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 40, @@ -2547,7 +2553,7 @@ }, "lineHeight": { "value": 120, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 112, @@ -2565,7 +2571,7 @@ }, "lineHeight": { "value": 108, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 72, @@ -2583,7 +2589,7 @@ }, "lineHeight": { "value": 96, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 64, @@ -2605,7 +2611,7 @@ }, "lineHeight": { "value": 84, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 56, @@ -2627,7 +2633,7 @@ }, "lineHeight": { "value": 72, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 48, @@ -2649,7 +2655,7 @@ }, "lineHeight": { "value": 60, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 40, @@ -2671,7 +2677,7 @@ }, "lineHeight": { "value": 36, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -2697,7 +2703,7 @@ }, "lineHeight": { "value": 28, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "", @@ -2719,7 +2725,7 @@ }, "lineHeight": { "value": 28, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "", @@ -2741,7 +2747,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "body-regular": { @@ -2759,7 +2765,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle-bold": { @@ -2777,7 +2783,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle-regular": { @@ -2795,7 +2801,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "caption-bold": { @@ -2813,7 +2819,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "uppercase", @@ -2839,7 +2845,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "uppercase", @@ -2861,7 +2867,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 14, diff --git a/mwui-token-farm/input/MW_core.json b/mwui-token-farm/input/MW_core.json index c1fd041b..44e6b5c2 100644 --- a/mwui-token-farm/input/MW_core.json +++ b/mwui-token-farm/input/MW_core.json @@ -257,7 +257,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "md": { @@ -271,7 +271,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 16, @@ -289,7 +289,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 20, @@ -307,7 +307,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -331,7 +331,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "color": { @@ -402,7 +402,7 @@ } } }, - "toggle-switch": { + "switch": { "defaultW": { "value": 52, "type": "sizing" @@ -413,13 +413,13 @@ } }, "controls": { - "checkbox-radiobutton": { + "checkbox-radio": { "container": { "value": 24, "type": "sizing" } }, - "radiobutton": { + "radio": { "outline": { "value": 20, "type": "sizing" @@ -637,6 +637,12 @@ "value": "2px", "type": "borderWidth" } + }, + "margin": { + "marginLeft": { + "value": 32, + "type": "spacing" + } } }, "checkbox": { @@ -679,7 +685,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } } }, @@ -699,7 +705,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "helperText": { @@ -717,7 +723,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "text": { @@ -735,7 +741,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "fg": { @@ -885,7 +891,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "uppercase", @@ -958,7 +964,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle": { @@ -976,7 +982,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "borderRadius": { @@ -1056,7 +1062,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle": { @@ -1074,7 +1080,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "borderRadius": { @@ -1267,7 +1273,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 14, @@ -1376,7 +1382,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 10, @@ -1394,7 +1400,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 14, @@ -1412,7 +1418,7 @@ }, "lineHeight": { "value": 48, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -1430,7 +1436,7 @@ }, "lineHeight": { "value": 48, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 32, @@ -1643,7 +1649,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "title": { @@ -1661,7 +1667,7 @@ }, "lineHeight": { "value": 36, - "type": "lineHeights" + "type": "lineHeight" } }, "subhead": { @@ -1679,7 +1685,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle": { @@ -1697,7 +1703,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "metadata": { @@ -1715,7 +1721,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "fg": { @@ -1869,7 +1875,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "fg": { @@ -1931,7 +1937,7 @@ }, "lineHeight": { "value": 36, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -1965,7 +1971,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 14, @@ -2036,7 +2042,7 @@ }, "lineHeight": { "value": 48, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -2056,7 +2062,7 @@ }, "lineHeight": { "value": 60, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 40, @@ -2547,7 +2553,7 @@ }, "lineHeight": { "value": 120, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 112, @@ -2565,7 +2571,7 @@ }, "lineHeight": { "value": 108, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 72, @@ -2583,7 +2589,7 @@ }, "lineHeight": { "value": 96, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 64, @@ -2605,7 +2611,7 @@ }, "lineHeight": { "value": 84, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 56, @@ -2627,7 +2633,7 @@ }, "lineHeight": { "value": 72, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 48, @@ -2649,7 +2655,7 @@ }, "lineHeight": { "value": 60, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 40, @@ -2671,7 +2677,7 @@ }, "lineHeight": { "value": 36, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -2697,7 +2703,7 @@ }, "lineHeight": { "value": 28, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "", @@ -2719,7 +2725,7 @@ }, "lineHeight": { "value": 28, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "", @@ -2741,7 +2747,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "body-regular": { @@ -2759,7 +2765,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle-bold": { @@ -2777,7 +2783,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle-regular": { @@ -2795,7 +2801,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "caption-bold": { @@ -2813,7 +2819,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "uppercase", @@ -2839,7 +2845,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "uppercase", @@ -2861,7 +2867,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 14, diff --git a/mwui-token-farm/input/MW_semantic_light.json b/mwui-token-farm/input/MW_semantic_light.json index c1fd041b..44e6b5c2 100644 --- a/mwui-token-farm/input/MW_semantic_light.json +++ b/mwui-token-farm/input/MW_semantic_light.json @@ -257,7 +257,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "md": { @@ -271,7 +271,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 16, @@ -289,7 +289,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 20, @@ -307,7 +307,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -331,7 +331,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "color": { @@ -402,7 +402,7 @@ } } }, - "toggle-switch": { + "switch": { "defaultW": { "value": 52, "type": "sizing" @@ -413,13 +413,13 @@ } }, "controls": { - "checkbox-radiobutton": { + "checkbox-radio": { "container": { "value": 24, "type": "sizing" } }, - "radiobutton": { + "radio": { "outline": { "value": 20, "type": "sizing" @@ -637,6 +637,12 @@ "value": "2px", "type": "borderWidth" } + }, + "margin": { + "marginLeft": { + "value": 32, + "type": "spacing" + } } }, "checkbox": { @@ -679,7 +685,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } } }, @@ -699,7 +705,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "helperText": { @@ -717,7 +723,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "text": { @@ -735,7 +741,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "fg": { @@ -885,7 +891,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "uppercase", @@ -958,7 +964,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle": { @@ -976,7 +982,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "borderRadius": { @@ -1056,7 +1062,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle": { @@ -1074,7 +1080,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "borderRadius": { @@ -1267,7 +1273,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 14, @@ -1376,7 +1382,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 10, @@ -1394,7 +1400,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 14, @@ -1412,7 +1418,7 @@ }, "lineHeight": { "value": 48, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -1430,7 +1436,7 @@ }, "lineHeight": { "value": 48, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 32, @@ -1643,7 +1649,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "title": { @@ -1661,7 +1667,7 @@ }, "lineHeight": { "value": 36, - "type": "lineHeights" + "type": "lineHeight" } }, "subhead": { @@ -1679,7 +1685,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle": { @@ -1697,7 +1703,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "metadata": { @@ -1715,7 +1721,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "fg": { @@ -1869,7 +1875,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "fg": { @@ -1931,7 +1937,7 @@ }, "lineHeight": { "value": 36, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -1965,7 +1971,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 14, @@ -2036,7 +2042,7 @@ }, "lineHeight": { "value": 48, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -2056,7 +2062,7 @@ }, "lineHeight": { "value": 60, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 40, @@ -2547,7 +2553,7 @@ }, "lineHeight": { "value": 120, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 112, @@ -2565,7 +2571,7 @@ }, "lineHeight": { "value": 108, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 72, @@ -2583,7 +2589,7 @@ }, "lineHeight": { "value": 96, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 64, @@ -2605,7 +2611,7 @@ }, "lineHeight": { "value": 84, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 56, @@ -2627,7 +2633,7 @@ }, "lineHeight": { "value": 72, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 48, @@ -2649,7 +2655,7 @@ }, "lineHeight": { "value": 60, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 40, @@ -2671,7 +2677,7 @@ }, "lineHeight": { "value": 36, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 24, @@ -2697,7 +2703,7 @@ }, "lineHeight": { "value": 28, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "", @@ -2719,7 +2725,7 @@ }, "lineHeight": { "value": 28, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "", @@ -2741,7 +2747,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "body-regular": { @@ -2759,7 +2765,7 @@ }, "lineHeight": { "value": 24, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle-bold": { @@ -2777,7 +2783,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "subtitle-regular": { @@ -2795,7 +2801,7 @@ }, "lineHeight": { "value": 20, - "type": "lineHeights" + "type": "lineHeight" } }, "caption-bold": { @@ -2813,7 +2819,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "uppercase", @@ -2839,7 +2845,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "textCase": { "value": "uppercase", @@ -2861,7 +2867,7 @@ }, "lineHeight": { "value": 16, - "type": "lineHeights" + "type": "lineHeight" }, "fontSize": { "value": 14, From 60d13ffc956e286afdea6e84edccaeed097e7af9 Mon Sep 17 00:00:00 2001 From: stefanrie <110181492+stefanrie@users.noreply.github.com> Date: Fri, 14 Jul 2023 15:07:26 +0200 Subject: [PATCH 2/4] hover-fg Komponente bei Chips angepasst --- mwui-token-farm/input/tokens.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mwui-token-farm/input/tokens.json b/mwui-token-farm/input/tokens.json index 77f5410b..018deb6f 100644 --- a/mwui-token-farm/input/tokens.json +++ b/mwui-token-farm/input/tokens.json @@ -3355,6 +3355,10 @@ "value": "$mw.semantic.color.fg.muted", "type": "color" }, + "hover": { + "value": "$mw.semantic.color.fg.muted", + "type": "color" + }, "disabled": { "value": "$mw.semantic.color.fg.disabled", "type": "color" From 157c7dbcaf7c01b99140509c0b1488f0a1909229 Mon Sep 17 00:00:00 2001 From: Michael Buchholz Date: Mon, 17 Jul 2023 09:58:31 +0200 Subject: [PATCH 3/4] remove resolved todo --- mwui-stencil/src/components/mw-chip/mw-chip.css | 1 - mwui-token-farm/input/MW_component.json | 4 ++++ mwui-token-farm/input/MW_core.json | 4 ++++ mwui-token-farm/input/MW_semantic_light.json | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mwui-stencil/src/components/mw-chip/mw-chip.css b/mwui-stencil/src/components/mw-chip/mw-chip.css index 0ad43b15..c82c4602 100644 --- a/mwui-stencil/src/components/mw-chip/mw-chip.css +++ b/mwui-stencil/src/components/mw-chip/mw-chip.css @@ -34,7 +34,6 @@ /* hover */ .chip:hover:not(.disabled) { - /* FIXME: fg-hover doesn't currently exist */ color: var(--mw-component-chips-color-fg-hover); background: var(--mw-component-chips-color-bg-hover); } diff --git a/mwui-token-farm/input/MW_component.json b/mwui-token-farm/input/MW_component.json index 44e6b5c2..a0069342 100644 --- a/mwui-token-farm/input/MW_component.json +++ b/mwui-token-farm/input/MW_component.json @@ -1314,6 +1314,10 @@ "value": "#44555b", "type": "color" }, + "hover": { + "value": "#44555b", + "type": "color" + }, "disabled": { "value": "#95a0a4", "type": "color" diff --git a/mwui-token-farm/input/MW_core.json b/mwui-token-farm/input/MW_core.json index 44e6b5c2..a0069342 100644 --- a/mwui-token-farm/input/MW_core.json +++ b/mwui-token-farm/input/MW_core.json @@ -1314,6 +1314,10 @@ "value": "#44555b", "type": "color" }, + "hover": { + "value": "#44555b", + "type": "color" + }, "disabled": { "value": "#95a0a4", "type": "color" diff --git a/mwui-token-farm/input/MW_semantic_light.json b/mwui-token-farm/input/MW_semantic_light.json index 44e6b5c2..a0069342 100644 --- a/mwui-token-farm/input/MW_semantic_light.json +++ b/mwui-token-farm/input/MW_semantic_light.json @@ -1314,6 +1314,10 @@ "value": "#44555b", "type": "color" }, + "hover": { + "value": "#44555b", + "type": "color" + }, "disabled": { "value": "#95a0a4", "type": "color" From a3ec03a25a428c5bc63d880a39bbeb1cbc801656 Mon Sep 17 00:00:00 2001 From: Michael Buchholz Date: Mon, 17 Jul 2023 13:24:32 +0200 Subject: [PATCH 4/4] add focused state to mw-tab, fix valueLabel text selection in mw-dropdown --- mwui-stencil/src/components/mw-dropdown/mw-dropdown.tsx | 3 +-- mwui-stencil/src/components/mw-tab/mw-tab.css | 8 ++++++-- mwui-stencil/src/components/mw-tab/mw-tab.tsx | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mwui-stencil/src/components/mw-dropdown/mw-dropdown.tsx b/mwui-stencil/src/components/mw-dropdown/mw-dropdown.tsx index ab2b0df0..5290ef8c 100644 --- a/mwui-stencil/src/components/mw-dropdown/mw-dropdown.tsx +++ b/mwui-stencil/src/components/mw-dropdown/mw-dropdown.tsx @@ -56,7 +56,7 @@ export class MwDropdown { @Listen("mwMenuItemClick") clickEmitterHandler(event): void { this.value = event.target.getAttribute("value"); - this.valueLabel = event.target.getAttribute("title"); + this.valueLabel = event.target.getAttribute("text"); } @Listen("mwPopoverOpen") stateEmitterHandler(event): void { @@ -94,7 +94,6 @@ export class MwDropdown {
-