Merge branch 'main' into #199-checkbox-group

MaibornWolff · Jul 17, 2023 · f83910c · f83910c
2 parents 681784c + a3ec03a
commit f83910c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 6 deletions.
diff --git 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);
 }
@@ -78,7 +77,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-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 {
         <div class="wrapper">
           <div class={{ "dropdown": true, "inline": this.inline, "has-error": this.hasError, "disabled": this.disabled }}>
             <mw-label name={this.name} label={this.label} required={this.required}></mw-label>
-
             <mw-popover noPadding={true} closeOnClick={true} open={this.isDropdownOpen}>
               <div slot="anchor" onClick={this.onFocus} class={{ "input": true, "has-error": this.hasError, "disabled": this.disabled }}>
                 <span

diff --git a/mwui-stencil/src/components/mw-tab/mw-tab.css b/mwui-stencil/src/components/mw-tab/mw-tab.css
@@ -31,8 +31,12 @@
   color: var(--mw-component-tabs-fg-selected);
   border-bottom: var(--mw-component-divider-border-width-default) solid var(--mw-component-tabs-fg-selected);
 }
-.mw-tab:active {
-  /* TODO: --mw-component-borders.scss-focused muss in mehrere Tokens aufgeteilt werden */
+.mw-tab:not(.selected):not(:disabled):active {
+  background: var(--mw-component-tabs-bg-pressed) !important;
+}
+.mw-tab:focus {
+  /* TODO: --mw-component-borders-focused muss in mehrere Tokens aufgeteilt werden */
+  border: 2px solid var(--mw-component-tabs-fg-selected);
 }
 .mw-tab:disabled {
   cursor: unset;

diff --git 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
@@ -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
@@ -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/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"