morya-ui 0.4.0 → 0.4.2

package/dist/button/style.css

@@ -9,6 +9,10 @@
     --m-color-border: #d9d9d9;
     --m-color-split: #f0f0f0;
     --m-color-focus-ring: #1677ff;
+    /* Soft translucent control-outline ring (primary bg composited over container) */
+    --m-color-control-outline: rgba(5, 145, 255, 0.1);
+    --m-color-control-outline-danger: rgba(255, 38, 5, 0.06);
+    --m-color-control-outline-warning: rgba(255, 215, 5, 0.1);
     /* Control sizing: medium control height 32px */
     --m-control-height-small: 24px;
     --m-control-height-medium: 32px;
@@ -22,12 +26,12 @@
 
     --m-radius-control: 6px;
     --m-border-width: 1px;
-    --m-focus-shadow: 0 0 0 2px
-        color-mix(in srgb, var(--m-color-primary) 45%, transparent);
-    --m-focus-shadow-danger: 0 0 0 2px
-        color-mix(in srgb, var(--m-color-danger) 45%, transparent);
-    --m-focus-shadow-warning: 0 0 0 2px
-        color-mix(in srgb, var(--m-color-warning) 45%, transparent);
+    --m-focus-outline-width: 2px;
+    --m-focus-shadow: 0 0 0 var(--m-focus-outline-width) var(--m-color-control-outline);
+    --m-focus-shadow-danger: 0 0 0 var(--m-focus-outline-width)
+        var(--m-color-control-outline-danger);
+    --m-focus-shadow-warning: 0 0 0 var(--m-focus-outline-width)
+        var(--m-color-control-outline-warning);
     --m-color-success: #52c41a;
     --m-color-info: #1677ff;
     --m-color-warning: #faad14;
@@ -253,7 +257,7 @@
     animation-play-state: paused !important;
 }
 
-/* Global density: scales spacing + control heights (Vuetify-inspired, WD tokens) */
+/* Global density: scales spacing + control heights (WD tokens) */
 :root,
 [data-m-density="comfortable"] {
     --m-density-scale: 1;
@@ -348,12 +352,15 @@
     --m-color-border: #424242;
     --m-color-split: #303030;
     --m-color-focus-ring: #3c89e8;
-    --m-focus-shadow: 0 0 0 2px
-        color-mix(in srgb, var(--m-color-primary) 50%, transparent);
-    --m-focus-shadow-danger: 0 0 0 2px
-        color-mix(in srgb, var(--m-color-danger) 50%, transparent);
-    --m-focus-shadow-warning: 0 0 0 2px
-        color-mix(in srgb, var(--m-color-warning) 50%, transparent);
+    /* Dark: getAlphaColor(color*Bg, colorBgContainer) */
+    --m-color-control-outline: rgba(23, 117, 249, 0.31);
+    --m-color-control-outline-danger: rgba(249, 75, 78, 0.31);
+    --m-color-control-outline-warning: rgba(250, 173, 20, 0.3);
+    --m-focus-shadow: 0 0 0 var(--m-focus-outline-width) var(--m-color-control-outline);
+    --m-focus-shadow-danger: 0 0 0 var(--m-focus-outline-width)
+        var(--m-color-control-outline-danger);
+    --m-focus-shadow-warning: 0 0 0 var(--m-focus-outline-width)
+        var(--m-color-control-outline-warning);
     /* Mid solids: keep ≥~4.5:1 with --m-color-on-emphasis on dark surfaces */
     --m-color-success: #49aa19;
     --m-color-info: #1668dc;
@@ -893,8 +900,10 @@
     width: 100%;
 }
 
+.m-textarea--invalid:focus,
 .m-textarea--invalid:focus-visible,
 .m-select--invalid.m-select--open,
+.m-select--invalid:focus,
 .m-select--invalid:focus-visible {
     border-color: var(--m-color-danger);
     box-shadow: var(--m-focus-shadow-danger);
@@ -1103,20 +1112,28 @@
     opacity: var(--m-opacity-disabled);
 }
 
-/* Shared Naive-like hover/focus for remaining form triggers */
+/* Shared hover/focus for remaining form triggers */
 .m-inputotp__input:hover:not(:disabled):not(:focus),
-.m-cascadeselect__trigger:hover:not(:disabled):not(:focus-visible),
-.m-treeselect__trigger:hover:not(:disabled):not(:focus-visible),
+.m-cascadeselect:not(.m-cascadeselect--open)
+    .m-cascadeselect__trigger:hover:not(:disabled):not(:focus):not(:focus-visible),
+.m-treeselect:not(.m-treeselect--open)
+    .m-treeselect__trigger:hover:not(:disabled):not(:focus):not(:focus-visible),
 .m-inputcolor__text:hover:not(:disabled):not(:focus),
-.m-inputtags:hover:not(.m-inputtags--disabled),
-.m-togglebutton:hover:not(:disabled):not(.m-togglebutton--checked),
-.m-inplace__display:hover {
+.m-inputtags:hover:not(.m-inputtags--disabled):not(:focus-within),
+.m-togglebutton:hover:not(:disabled):not(.m-togglebutton--checked):not(:focus-visible),
+.m-inplace__display:hover:not(:focus-visible) {
     border-color: var(--m-color-primary-hover);
 }
 
+.m-inputotp__input:focus,
 .m-inputotp__input:focus-visible,
+.m-cascadeselect--open .m-cascadeselect__trigger,
+.m-cascadeselect__trigger:focus,
 .m-cascadeselect__trigger:focus-visible,
+.m-treeselect--open .m-treeselect__trigger,
+.m-treeselect__trigger:focus,
 .m-treeselect__trigger:focus-visible,
+.m-inputcolor__text:focus,
 .m-inputcolor__text:focus-visible,
 .m-inputtags:focus-within,
 .m-togglebutton:focus-visible,
@@ -1125,13 +1142,15 @@
 .m-splitbutton__trigger:focus-visible,
 .m-inplace__display:focus-visible,
 .m-pagination__button:focus-visible {
-    border-color: var(--m-color-primary-hover);
+    border-color: var(--m-color-primary);
     box-shadow: var(--m-focus-shadow);
     outline: none;
 }
 
+.m-inputotp--invalid .m-inputotp__input:focus,
 .m-inputotp--invalid .m-inputotp__input:focus-visible,
 .m-inputtags--invalid:focus-within,
+.m-inputcolor--invalid .m-inputcolor__text:focus,
 .m-inputcolor--invalid .m-inputcolor__text:focus-visible {
     border-color: var(--m-color-danger);
     box-shadow: var(--m-focus-shadow-danger);
@@ -1186,6 +1205,13 @@
     animation: none !important;
 }
 
+/* ConfigProvider passes height to layout roots when the app shell is full-height. */
+.m-config-provider {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
 .m-icon {
     color: currentColor;
     display: inline-flex;
@@ -1236,6 +1262,14 @@
 }
 
 .m-button {
+    /* Geometry */
+    --m-button-radius: var(--m-radius-control);
+    --m-button-border-width: var(--m-border-width);
+    --m-button-gap: var(--m-space-2);
+    --m-button-font-weight: var(--m-font-weight);
+    --m-button-font-size: var(--m-control-font-medium);
+    --m-button-height: var(--m-control-height-medium);
+    --m-button-padding-x: var(--m-button-padding-x-medium);
     --m-button-padding-x-small: var(--m-control-padding-x-small);
     --m-button-padding-x-medium: calc(
         var(--m-control-padding-x-medium) + var(--m-space-1)
@@ -1243,62 +1277,117 @@
     --m-button-padding-x-large: calc(
         var(--m-control-padding-x-large) + var(--m-space-1)
     );
-    --m-button-icon-stack-min-height: 3.25rem;
-    --m-button-badge-min-width: 1.15rem;
-    --m-button-spinner-size: 0.875rem;
+    --m-button-padding-x-round-extra: var(--m-space-2);
+
+    /* Icon / spinner */
     --m-button-icon-size: 1rem;
-    --m-button-bg: var(--m-color-primary);
-    --m-button-fg: var(--m-color-on-emphasis);
-    --m-button-border: var(--m-color-primary);
-    --m-button-hover-bg: var(--m-color-primary-hover);
-    --m-button-hover-fg: var(--m-color-on-emphasis);
-    --m-button-hover-border: var(--m-color-primary-hover);
-    --m-button-active-bg: var(--m-color-primary-active);
+    --m-button-icon-size-small: 0.875rem;
+    --m-button-icon-size-large: 1.25rem;
+    --m-button-spinner-size: 0.875rem;
+    --m-button-spinner-border-width: 2px;
+    --m-button-cn-letter-spacing: 0.3em;
+
+    /* Soft fill opacities (theme-adaptive via surface mix) */
+    --m-button-fill-opacity: 10%;
+    --m-button-fill-opacity-hover: 16%;
+    --m-button-fill-opacity-active: 22%;
+    --m-button-fill-opacity-muted: 6%;
+    --m-button-fill-opacity-muted-hover: 10%;
+    --m-button-fill-opacity-muted-active: 14%;
+
+    /* Interaction */
+    --m-button-loading-opacity: 0.72;
+    --m-button-press-scale: 0.97;
+    --m-button-press-duration: 160ms;
+    --m-button-ripple-duration: 560ms;
+    --m-button-ripple-opacity-start: 0.42;
+    --m-button-ripple-opacity-mid: 0.22;
+    --m-button-ghost-hover-opacity: 80%;
+
+    /* Color axis defaults (overridden by --color-*) */
+    --m-button-color-base: var(--m-color-primary);
+    --m-button-color-hover: var(--m-color-primary-hover);
+    --m-button-color-active: var(--m-color-primary-active);
+    --m-button-color-light: color-mix(
+        in srgb,
+        var(--m-button-color-base) var(--m-button-fill-opacity),
+        var(--m-color-surface)
+    );
+    --m-button-color-light-hover: color-mix(
+        in srgb,
+        var(--m-button-color-base) var(--m-button-fill-opacity-hover),
+        var(--m-color-surface)
+    );
+    --m-button-color-light-active: color-mix(
+        in srgb,
+        var(--m-button-color-base) var(--m-button-fill-opacity-active),
+        var(--m-color-surface)
+    );
+    --m-button-on-color: var(--m-color-on-emphasis);
+
+    /* Variant surface vars */
+    --m-button-bg: var(--m-color-surface);
+    --m-button-fg: var(--m-color-text);
+    --m-button-border: var(--m-color-border);
+    --m-button-hover-bg: var(--m-button-bg);
+    --m-button-hover-fg: var(--m-button-fg);
+    --m-button-hover-border: var(--m-button-border);
+    --m-button-active-bg: var(--m-button-bg);
+    --m-button-border-style: solid;
+
+    --m-button-active-fg: var(--m-button-fg);
+    --m-button-active-border: var(--m-button-border);
+
     align-items: center;
     background: var(--m-button-bg);
-    border: var(--m-border-width) solid var(--m-button-border);
-    border-radius: var(--m-radius-control);
+    border: var(--m-button-border-width) var(--m-button-border-style)
+        var(--m-button-border);
+    border-radius: var(--m-button-radius);
     color: var(--m-button-fg);
     cursor: pointer;
     display: inline-flex;
     flex-direction: row;
     font-family: var(--m-font-sans);
-    font-size: var(--m-control-font-medium);
-    font-weight: 400;
-    gap: var(--m-space-2);
+    font-size: var(--m-button-font-size);
+    font-weight: var(--m-button-font-weight);
+    gap: var(--m-button-gap);
     justify-content: center;
     line-height: 1;
-    min-height: var(--m-control-height-medium);
-    padding: 0 var(--m-button-padding-x-medium);
+    min-height: var(--m-button-height);
+    padding: 0 var(--m-button-padding-x);
     position: relative;
+    text-decoration: none;
+    touch-action: manipulation;
     transition:
         background-color var(--m-motion-fast) var(--m-motion-ease),
         border-color var(--m-motion-fast) var(--m-motion-ease),
         color var(--m-motion-fast) var(--m-motion-ease),
         box-shadow var(--m-motion-fast) var(--m-motion-ease),
         opacity var(--m-motion-fast) var(--m-motion-ease),
-        transform 160ms var(--m-motion-ease);
+        transform var(--m-button-press-duration) var(--m-motion-ease);
+    user-select: none;
     vertical-align: middle;
     white-space: nowrap;
 }
 
 @media (hover: hover) and (pointer: fine) {
-    .m-button:hover:not(:disabled) {
+    .m-button:hover:not(:disabled):not(.m-button--disabled) {
         background: var(--m-button-hover-bg);
         border-color: var(--m-button-hover-border);
         color: var(--m-button-hover-fg);
     }
 }
 
-.m-button:active:not(:disabled) {
+.m-button:active:not(:disabled):not(.m-button--disabled):not(.m-button--loading) {
     background: var(--m-button-active-bg);
+    border-color: var(--m-button-active-border);
+    color: var(--m-button-active-fg);
 }
 
-.m-button--press:active:not(:disabled) {
-    transform: scale(0.97);
+.m-button--press:active:not(:disabled):not(.m-button--disabled) {
+    transform: scale(var(--m-button-press-scale));
 }
 
-/* Naive-style focus: soft glow, not outline-offset ring */
 .m-button:focus {
     outline: none;
 }
@@ -1308,804 +1397,419 @@
     outline: none;
 }
 
-.m-button:disabled {
-    background: color-mix(in srgb, var(--m-color-text) 4%, var(--m-color-surface));
+.m-button:disabled,
+.m-button--disabled {
+    background: var(--m-color-bg-disabled);
     border-color: var(--m-color-border);
-    color: color-mix(in srgb, var(--m-color-text) 35%, var(--m-color-surface));
+    color: var(--m-color-text-disabled);
     cursor: not-allowed;
     opacity: 1;
 }
 
-.m-button--text:disabled,
-.m-button--link:disabled,
+.m-button--variant-text:disabled,
+.m-button--variant-link:disabled,
+.m-button--variant-text.m-button--disabled,
+.m-button--variant-link.m-button--disabled,
 .m-button--ghost:disabled,
-.m-button--quaternary:disabled {
+.m-button--ghost.m-button--disabled {
     background: transparent;
     border-color: transparent;
 }
 
-.m-button--primary {
-    --m-button-bg: var(--m-color-primary);
-    --m-button-fg: var(--m-color-on-emphasis);
-    --m-button-border: var(--m-color-primary);
-    --m-button-hover-bg: var(--m-color-primary-hover);
-    --m-button-hover-fg: var(--m-color-on-emphasis);
-    --m-button-hover-border: var(--m-color-primary-hover);
-    --m-button-active-bg: var(--m-color-primary-active);
-}
-
-.m-button--secondary {
-    --m-button-bg: var(--m-color-surface);
-    --m-button-fg: var(--m-color-text);
-    --m-button-border: var(--m-color-border);
-    --m-button-hover-bg: var(--m-color-surface);
-    --m-button-hover-fg: var(--m-color-primary-hover);
-    --m-button-hover-border: var(--m-color-primary-hover);
-    --m-button-active-bg: var(--m-color-surface);
-}
+/* ---------- Color axis ---------- */
 
-.m-button--success {
-    --m-button-bg: var(--m-color-success);
-    --m-button-fg: var(--m-color-on-emphasis);
-    --m-button-border: var(--m-color-success);
-    --m-button-hover-bg: color-mix(
+.m-button--color-default {
+    --m-button-color-base: var(--m-color-text);
+    --m-button-color-hover: var(--m-color-primary-hover);
+    --m-button-color-active: var(--m-color-primary-active);
+    --m-button-color-light: color-mix(
         in srgb,
-        var(--m-color-success) 85%,
-        black
+        var(--m-color-text) var(--m-button-fill-opacity-muted),
+        var(--m-color-surface)
     );
-    --m-button-hover-fg: var(--m-color-on-emphasis);
-    --m-button-hover-border: color-mix(
+    --m-button-color-light-hover: color-mix(
         in srgb,
-        var(--m-color-success) 85%,
-        black
+        var(--m-color-text) var(--m-button-fill-opacity-muted-hover),
+        var(--m-color-surface)
     );
-    --m-button-active-bg: color-mix(
+    --m-button-color-light-active: color-mix(
         in srgb,
-        var(--m-color-success) 75%,
-        black
+        var(--m-color-text) var(--m-button-fill-opacity-muted-active),
+        var(--m-color-surface)
     );
-}
-
-.m-button--info {
-    --m-button-bg: var(--m-color-info);
-    --m-button-fg: var(--m-color-on-emphasis);
-    --m-button-border: var(--m-color-info);
-    --m-button-hover-bg: color-mix(in srgb, var(--m-color-info) 85%, black);
-    --m-button-hover-fg: var(--m-color-on-emphasis);
-    --m-button-hover-border: color-mix(
+    --m-button-on-color: var(--m-color-contrast-fg);
+    --m-button-solid-bg: var(--m-color-contrast);
+    --m-button-solid-bg-hover: var(--m-color-contrast-hover);
+    --m-button-solid-bg-active: var(--m-color-contrast-active);
+    --m-button-outlined-border: var(--m-color-border);
+    --m-button-outlined-fg: var(--m-color-text);
+    --m-button-outlined-hover-border: var(--m-color-primary-hover);
+    --m-button-outlined-hover-fg: var(--m-color-primary-hover);
+    --m-button-outlined-bg: var(--m-color-surface);
+    /* Match ant default outlined/dashed: keep surface bg, only shift border/text. */
+    --m-button-outlined-hover-bg: var(--m-color-surface);
+    --m-button-outlined-active-bg: var(--m-color-surface);
+}
+
+.m-button--color-primary {
+    --m-button-color-base: var(--m-color-primary);
+    --m-button-color-hover: var(--m-color-primary-hover);
+    --m-button-color-active: var(--m-color-primary-active);
+    --m-button-solid-bg: var(--m-color-primary);
+    --m-button-solid-bg-hover: var(--m-color-primary-hover);
+    --m-button-solid-bg-active: var(--m-color-primary-active);
+    --m-button-outlined-border: var(--m-color-primary);
+    --m-button-outlined-fg: var(--m-color-primary);
+    --m-button-outlined-hover-border: var(--m-color-primary-hover);
+    --m-button-outlined-hover-fg: var(--m-color-primary-hover);
+    --m-button-outlined-bg: var(--m-color-surface);
+    --m-button-outlined-hover-bg: var(--m-button-color-light);
+}
+
+.m-button--color-danger {
+    --m-button-color-base: var(--m-color-danger);
+    --m-button-color-hover: color-mix(
         in srgb,
-        var(--m-color-info) 85%,
-        black
+        var(--m-color-danger) 88%,
+        var(--m-color-text)
     );
-    --m-button-active-bg: color-mix(in srgb, var(--m-color-info) 75%, black);
-}
-
-.m-button--warn {
-    --m-button-bg: var(--m-color-warn);
-    --m-button-fg: var(--m-color-on-emphasis);
-    --m-button-border: var(--m-color-warn);
-    --m-button-hover-bg: color-mix(in srgb, var(--m-color-warn) 85%, black);
-    --m-button-hover-fg: var(--m-color-on-emphasis);
-    --m-button-hover-border: color-mix(
+    --m-button-color-active: color-mix(
         in srgb,
-        var(--m-color-warn) 85%,
-        black
-    );
-    --m-button-active-bg: color-mix(in srgb, var(--m-color-warn) 75%, black);
-}
-
-.m-button--help {
-    --m-button-bg: var(--m-color-help);
-    --m-button-fg: var(--m-color-on-emphasis);
-    --m-button-border: var(--m-color-help);
-    --m-button-hover-bg: color-mix(in srgb, var(--m-color-help) 85%, black);
-    --m-button-hover-fg: var(--m-color-on-emphasis);
-    --m-button-hover-border: color-mix(
+        var(--m-color-danger) 76%,
+        var(--m-color-text)
+    );
+    --m-button-solid-bg: var(--m-color-danger);
+    --m-button-solid-bg-hover: var(--m-button-color-hover);
+    --m-button-solid-bg-active: var(--m-button-color-active);
+    --m-button-outlined-border: var(--m-color-danger);
+    --m-button-outlined-fg: var(--m-color-danger);
+    --m-button-outlined-hover-border: var(--m-button-color-hover);
+    --m-button-outlined-hover-fg: var(--m-button-color-hover);
+    --m-button-outlined-bg: var(--m-color-surface);
+    --m-button-outlined-hover-bg: var(--m-button-color-light);
+}
+
+.m-button--color-success {
+    --m-button-color-base: var(--m-color-success);
+    --m-button-color-hover: color-mix(
         in srgb,
-        var(--m-color-help) 85%,
-        black
+        var(--m-color-success) 88%,
+        var(--m-color-text)
     );
-    --m-button-active-bg: color-mix(in srgb, var(--m-color-help) 75%, black);
-}
-
-.m-button--danger {
-    --m-button-bg: var(--m-color-danger);
-    --m-button-fg: var(--m-color-on-emphasis);
-    --m-button-border: var(--m-color-danger);
-    --m-button-hover-bg: color-mix(in srgb, var(--m-color-danger) 85%, black);
-    --m-button-hover-fg: var(--m-color-on-emphasis);
-    --m-button-hover-border: color-mix(
+    --m-button-color-active: color-mix(
         in srgb,
-        var(--m-color-danger) 85%,
-        black
-    );
-    --m-button-active-bg: color-mix(
+        var(--m-color-success) 76%,
+        var(--m-color-text)
+    );
+    --m-button-solid-bg: var(--m-color-success);
+    --m-button-solid-bg-hover: var(--m-button-color-hover);
+    --m-button-solid-bg-active: var(--m-button-color-active);
+    --m-button-outlined-border: var(--m-color-success);
+    --m-button-outlined-fg: var(--m-color-success);
+    --m-button-outlined-hover-border: var(--m-button-color-hover);
+    --m-button-outlined-hover-fg: var(--m-button-color-hover);
+    --m-button-outlined-bg: var(--m-color-surface);
+    --m-button-outlined-hover-bg: var(--m-button-color-light);
+}
+
+.m-button--color-info {
+    --m-button-color-base: var(--m-color-info);
+    --m-button-color-hover: color-mix(
         in srgb,
-        var(--m-color-danger) 75%,
-        black
+        var(--m-color-info) 88%,
+        var(--m-color-text)
     );
-}
-
-.m-button--contrast {
-    --m-button-bg: var(--m-color-contrast);
-    --m-button-fg: var(--m-color-contrast-fg);
-    --m-button-border: var(--m-color-contrast);
-    --m-button-hover-bg: var(--m-color-contrast-hover);
-    --m-button-hover-fg: var(--m-color-contrast-fg);
-    --m-button-hover-border: var(--m-color-contrast-hover);
-    --m-button-active-bg: var(--m-color-contrast-active);
-}
-
-.m-button--outlined {
-    --m-button-bg: transparent;
-    --m-button-fg: var(--m-button-border);
-    --m-button-hover-bg: color-mix(
+    --m-button-color-active: color-mix(
         in srgb,
-        var(--m-button-border) 10%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-button-border);
-    --m-button-hover-border: var(--m-button-border);
-    --m-button-active-bg: color-mix(
+        var(--m-color-info) 76%,
+        var(--m-color-text)
+    );
+    --m-button-solid-bg: var(--m-color-info);
+    --m-button-solid-bg-hover: var(--m-button-color-hover);
+    --m-button-solid-bg-active: var(--m-button-color-active);
+    --m-button-outlined-border: var(--m-color-info);
+    --m-button-outlined-fg: var(--m-color-info);
+    --m-button-outlined-hover-border: var(--m-button-color-hover);
+    --m-button-outlined-hover-fg: var(--m-button-color-hover);
+    --m-button-outlined-bg: var(--m-color-surface);
+    --m-button-outlined-hover-bg: var(--m-button-color-light);
+}
+
+.m-button--color-warning {
+    --m-button-color-base: var(--m-color-warn);
+    --m-button-color-hover: color-mix(
         in srgb,
-        var(--m-button-border) 16%,
-        transparent
+        var(--m-color-warn) 88%,
+        var(--m-color-text)
     );
-}
-
-/* Idle matches outlined hover; hover/active deepen the tint. */
-.m-button--plain {
-    --m-button-bg: color-mix(
+    --m-button-color-active: color-mix(
         in srgb,
-        var(--m-button-border) 10%,
-        transparent
-    );
-    --m-button-fg: var(--m-button-border);
-    --m-button-hover-bg: color-mix(
+        var(--m-color-warn) 76%,
+        var(--m-color-text)
+    );
+    --m-button-solid-bg: var(--m-color-warn);
+    --m-button-solid-bg-hover: var(--m-button-color-hover);
+    --m-button-solid-bg-active: var(--m-button-color-active);
+    --m-button-outlined-border: var(--m-color-warn);
+    --m-button-outlined-fg: var(--m-color-warn);
+    --m-button-outlined-hover-border: var(--m-button-color-hover);
+    --m-button-outlined-hover-fg: var(--m-button-color-hover);
+    --m-button-outlined-bg: var(--m-color-surface);
+    --m-button-outlined-hover-bg: var(--m-button-color-light);
+}
+
+.m-button--color-help {
+    --m-button-color-base: var(--m-color-help);
+    --m-button-color-hover: color-mix(
         in srgb,
-        var(--m-button-border) 16%,
-        transparent
+        var(--m-color-help) 88%,
+        var(--m-color-text)
     );
-    --m-button-hover-fg: var(--m-button-border);
-    --m-button-hover-border: var(--m-button-border);
-    --m-button-active-bg: color-mix(
+    --m-button-color-active: color-mix(
         in srgb,
-        var(--m-button-border) 22%,
-        transparent
-    );
-}
-
-.m-button--secondary.m-button--outlined,
-.m-button--secondary.m-button--plain {
-    --m-button-border: var(--m-color-border);
-    --m-button-fg: var(--m-color-text);
-    --m-button-hover-fg: var(--m-color-text);
-}
-
-.m-button--text,
-.m-button--link {
-    --m-button-bg: transparent;
+        var(--m-color-help) 76%,
+        var(--m-color-text)
+    );
+    --m-button-solid-bg: var(--m-color-help);
+    --m-button-solid-bg-hover: var(--m-button-color-hover);
+    --m-button-solid-bg-active: var(--m-button-color-active);
+    --m-button-outlined-border: var(--m-color-help);
+    --m-button-outlined-fg: var(--m-color-help);
+    --m-button-outlined-hover-border: var(--m-button-color-hover);
+    --m-button-outlined-hover-fg: var(--m-button-color-hover);
+    --m-button-outlined-bg: var(--m-color-surface);
+    --m-button-outlined-hover-bg: var(--m-button-color-light);
+}
+
+.m-button--color-contrast {
+    --m-button-color-base: var(--m-color-contrast);
+    --m-button-color-hover: var(--m-color-contrast-hover);
+    --m-button-color-active: var(--m-color-contrast-active);
+    --m-button-on-color: var(--m-color-contrast-fg);
+    --m-button-solid-bg: var(--m-color-contrast);
+    --m-button-solid-bg-hover: var(--m-color-contrast-hover);
+    --m-button-solid-bg-active: var(--m-color-contrast-active);
+    --m-button-outlined-border: var(--m-color-contrast);
+    --m-button-outlined-fg: var(--m-color-contrast);
+    --m-button-outlined-hover-border: var(--m-color-contrast-hover);
+    --m-button-outlined-hover-fg: var(--m-color-contrast-hover);
+    --m-button-outlined-bg: var(--m-color-surface);
+    --m-button-outlined-hover-bg: var(--m-button-color-light);
+}
+
+.m-button--color-link {
+    --m-button-color-base: var(--m-color-primary);
+    --m-button-color-hover: var(--m-color-primary-hover);
+    --m-button-color-active: var(--m-color-primary-active);
+}
+
+/* ---------- Variant axis ---------- */
+
+.m-button--variant-solid {
+    --m-button-bg: var(--m-button-solid-bg, var(--m-button-color-base));
+    --m-button-fg: var(--m-button-on-color);
     --m-button-border: transparent;
-    --m-button-fg: var(--m-color-primary);
-    --m-button-hover-fg: var(--m-color-primary);
-    --m-button-hover-border: transparent;
-}
-
-.m-button--text {
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-primary) 10%,
-        transparent
+    --m-button-hover-bg: var(
+        --m-button-solid-bg-hover,
+        var(--m-button-color-hover)
     );
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-color-primary) 16%,
-        transparent
-    );
-}
-
-.m-button--link {
-    --m-button-bg: transparent;
-    --m-button-hover-bg: transparent;
-    --m-button-active-bg: transparent;
-    height: auto;
-    min-height: 0;
-    padding: 0;
-}
-
-.m-button--link.m-button--link-underline:hover:not(:disabled) {
-    text-decoration: underline;
-}
-
-.m-button--link:not(.m-button--link-underline):hover:not(:disabled) {
-    opacity: 0.8;
-}
-
-.m-button--secondary.m-button--text {
-    --m-button-fg: var(--m-color-text-muted);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-text-muted) 12%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-color-text);
-}
-
-.m-button--secondary.m-button--link {
-    --m-button-fg: var(--m-color-text-muted);
-    --m-button-hover-fg: var(--m-color-text);
-}
-
-.m-button--success.m-button--text,
-.m-button--success.m-button--outlined {
-    --m-button-fg: var(--m-color-success);
-    --m-button-border: var(--m-color-success);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-success) 10%,
-        transparent
+    --m-button-hover-fg: var(--m-button-on-color);
+    --m-button-hover-border: transparent;
+    --m-button-active-bg: var(
+        --m-button-solid-bg-active,
+        var(--m-button-color-active)
     );
-    --m-button-hover-fg: var(--m-color-success);
-    --m-button-hover-border: var(--m-color-success);
-}
-
-.m-button--success.m-button--link {
-    --m-button-fg: var(--m-color-success);
-    --m-button-hover-fg: var(--m-color-success);
+    --m-button-active-fg: var(--m-button-on-color);
+    --m-button-active-border: transparent;
 }
 
-.m-button--info.m-button--text,
-.m-button--info.m-button--outlined {
-    --m-button-fg: var(--m-color-info);
-    --m-button-border: var(--m-color-info);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-info) 10%,
-        transparent
+.m-button--variant-outlined,
+.m-button--variant-dashed {
+    --m-button-bg: var(--m-button-outlined-bg, var(--m-color-surface));
+    --m-button-fg: var(--m-button-outlined-fg, var(--m-button-color-base));
+    --m-button-border: var(
+        --m-button-outlined-border,
+        var(--m-button-color-base)
     );
-    --m-button-hover-fg: var(--m-color-info);
-    --m-button-hover-border: var(--m-color-info);
-}
-
-.m-button--info.m-button--link {
-    --m-button-fg: var(--m-color-info);
-    --m-button-hover-fg: var(--m-color-info);
-}
-
-.m-button--warn.m-button--text,
-.m-button--warn.m-button--outlined {
-    --m-button-fg: var(--m-color-warn);
-    --m-button-border: var(--m-color-warn);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-warn) 10%,
-        transparent
+    --m-button-hover-bg: var(
+        --m-button-outlined-hover-bg,
+        var(--m-button-color-light)
     );
-    --m-button-hover-fg: var(--m-color-warn);
-    --m-button-hover-border: var(--m-color-warn);
-}
-
-.m-button--warn.m-button--link {
-    --m-button-fg: var(--m-color-warn);
-    --m-button-hover-fg: var(--m-color-warn);
-}
-
-.m-button--help.m-button--text,
-.m-button--help.m-button--outlined {
-    --m-button-fg: var(--m-color-help);
-    --m-button-border: var(--m-color-help);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-help) 10%,
-        transparent
+    --m-button-hover-fg: var(
+        --m-button-outlined-hover-fg,
+        var(--m-button-color-hover)
     );
-    --m-button-hover-fg: var(--m-color-help);
-    --m-button-hover-border: var(--m-color-help);
-}
-
-.m-button--help.m-button--link {
-    --m-button-fg: var(--m-color-help);
-    --m-button-hover-fg: var(--m-color-help);
-}
-
-.m-button--danger.m-button--text,
-.m-button--danger.m-button--outlined {
-    --m-button-fg: var(--m-color-danger);
-    --m-button-border: var(--m-color-danger);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-danger) 10%,
-        transparent
+    --m-button-hover-border: var(
+        --m-button-outlined-hover-border,
+        var(--m-button-color-hover)
     );
-    --m-button-hover-fg: var(--m-color-danger);
-    --m-button-hover-border: var(--m-color-danger);
-}
-
-.m-button--danger.m-button--link {
-    --m-button-fg: var(--m-color-danger);
-    --m-button-hover-fg: var(--m-color-danger);
-}
-
-.m-button--contrast.m-button--text,
-.m-button--contrast.m-button--outlined {
-    --m-button-fg: var(--m-color-contrast);
-    --m-button-border: var(--m-color-contrast);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-contrast) 10%,
-        transparent
+    --m-button-active-bg: var(
+        --m-button-outlined-active-bg,
+        var(--m-button-color-light-active, var(--m-button-color-light))
     );
-    --m-button-hover-fg: var(--m-color-contrast);
-    --m-button-hover-border: var(--m-color-contrast);
-}
-
-.m-button--contrast.m-button--link {
-    --m-button-fg: var(--m-color-contrast);
-    --m-button-hover-fg: var(--m-color-contrast);
-}
-
-.m-button--plain.m-button--text,
-.m-button--plain.m-button--outlined {
-    --m-button-bg: transparent;
-    --m-button-fg: var(--m-color-text-muted);
-    --m-button-border: var(--m-color-border);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-text-muted) 12%,
-        transparent
+    --m-button-active-fg: var(
+        --m-button-color-active,
+        var(--m-button-hover-fg)
     );
-    --m-button-hover-fg: var(--m-color-text);
-    --m-button-hover-border: var(--m-color-border);
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-color-text-muted) 18%,
-        transparent
+    --m-button-active-border: var(
+        --m-button-color-active,
+        var(--m-button-hover-border)
     );
 }
 
-.m-button--plain.m-button--link {
-    --m-button-fg: var(--m-color-text-muted);
-    --m-button-hover-fg: var(--m-color-text);
+.m-button--variant-dashed {
+    --m-button-border-style: dashed;
 }
 
-.m-button--ghost {
-    --m-button-bg: color-mix(
-        in srgb,
-        var(--m-color-primary) 10%,
-        transparent
-    );
+.m-button--variant-filled {
+    --m-button-bg: var(--m-button-color-light);
+    --m-button-fg: var(--m-button-color-base);
     --m-button-border: transparent;
-    --m-button-fg: var(--m-color-primary);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-primary) 16%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-color-primary);
+    --m-button-hover-bg: var(--m-button-color-light-hover);
+    --m-button-hover-fg: var(--m-button-color-base);
     --m-button-hover-border: transparent;
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-color-primary) 22%,
-        transparent
-    );
+    --m-button-active-bg: var(--m-button-color-light-active);
+    --m-button-active-fg: var(--m-button-color-base);
+    --m-button-active-border: transparent;
 }
 
-.m-button--secondary.m-button--ghost {
-    --m-button-bg: color-mix(
-        in srgb,
-        var(--m-color-text-muted) 12%,
-        transparent
-    );
-    --m-button-fg: var(--m-color-text);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-text-muted) 18%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-color-text);
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-color-text-muted) 24%,
-        transparent
-    );
-}
-
-.m-button--success.m-button--ghost {
-    --m-button-bg: color-mix(
-        in srgb,
-        var(--m-color-success) 10%,
-        transparent
-    );
-    --m-button-fg: var(--m-color-success);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-success) 16%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-color-success);
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-color-success) 22%,
-        transparent
-    );
-}
-
-.m-button--info.m-button--ghost {
-    --m-button-bg: color-mix(
-        in srgb,
-        var(--m-color-info) 10%,
-        transparent
-    );
-    --m-button-fg: var(--m-color-info);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-info) 16%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-color-info);
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-color-info) 22%,
-        transparent
-    );
+.m-button--variant-text,
+.m-button--variant-link {
+    --m-button-bg: transparent;
+    --m-button-fg: var(--m-button-color-base);
+    --m-button-border: transparent;
+    --m-button-hover-fg: var(--m-button-color-hover);
+    --m-button-hover-border: transparent;
+    --m-button-active-bg: transparent;
+    --m-button-active-fg: var(--m-button-color-active, var(--m-button-color-hover));
+    --m-button-active-border: transparent;
 }
 
-.m-button--warn.m-button--ghost {
-    --m-button-bg: color-mix(
-        in srgb,
-        var(--m-color-warn) 10%,
-        transparent
-    );
-    --m-button-fg: var(--m-color-warn);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-warn) 16%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-color-warn);
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-color-warn) 22%,
-        transparent
-    );
+.m-button--variant-text {
+    --m-button-hover-bg: var(--m-button-color-light);
+    --m-button-active-bg: var(--m-button-color-light-active);
 }
 
-.m-button--help.m-button--ghost {
-    --m-button-bg: color-mix(
-        in srgb,
-        var(--m-color-help) 10%,
-        transparent
-    );
-    --m-button-fg: var(--m-color-help);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-help) 16%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-color-help);
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-color-help) 22%,
-        transparent
-    );
+.m-button--variant-link {
+    --m-button-hover-bg: transparent;
+    --m-button-height: auto;
+    height: auto;
+    min-height: 0;
+    padding: 0;
 }
 
-.m-button--danger.m-button--ghost {
-    --m-button-bg: color-mix(
-        in srgb,
-        var(--m-color-danger) 10%,
-        transparent
-    );
-    --m-button-fg: var(--m-color-danger);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-danger) 16%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-color-danger);
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-color-danger) 22%,
-        transparent
-    );
+.m-button--variant-link:hover:not(:disabled):not(.m-button--disabled) {
+    text-decoration: underline;
 }
 
-.m-button--contrast.m-button--ghost {
-    --m-button-bg: color-mix(
-        in srgb,
-        var(--m-color-contrast) 10%,
-        transparent
-    );
-    --m-button-fg: var(--m-color-contrast);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-contrast) 16%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-color-contrast);
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-color-contrast) 22%,
-        transparent
-    );
+.m-button--color-default.m-button--variant-text {
+    --m-button-color-base: var(--m-color-text);
+    --m-button-color-hover: var(--m-color-text);
+    --m-button-hover-bg: var(--m-button-color-light);
+    --m-button-active-bg: var(--m-button-color-light-hover);
 }
 
-.m-button--quaternary {
-    --m-button-bg: transparent;
-    --m-button-border: transparent;
-    --m-button-fg: var(--m-color-text);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-color-text-muted) 10%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-color-text);
-    --m-button-hover-border: transparent;
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-color-text-muted) 16%,
-        transparent
-    );
+.m-button--color-default.m-button--variant-filled {
+    --m-button-color-base: var(--m-color-text);
 }
 
-.m-button--custom {
-    --m-button-bg: var(--m-button-color);
-    --m-button-fg: var(--m-color-on-emphasis);
-    --m-button-border: var(--m-button-color);
-    --m-button-hover-bg: color-mix(in srgb, var(--m-button-color) 85%, black);
-    --m-button-hover-fg: var(--m-color-on-emphasis);
-    --m-button-hover-border: color-mix(
-        in srgb,
-        var(--m-button-color) 85%,
-        black
-    );
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-button-color) 75%,
-        black
-    );
+.m-button--color-link.m-button--variant-link {
+    --m-button-color-base: var(--m-color-primary);
+    --m-button-color-hover: var(--m-color-primary-hover);
 }
 
-.m-button--custom.m-button--outlined {
+/* Ghost: transparent fill on bordered variants */
+.m-button--ghost {
     --m-button-bg: transparent;
-    --m-button-fg: var(--m-button-color);
-    --m-button-border: var(--m-button-color);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-button-color) 12%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-button-color);
-    --m-button-hover-border: var(--m-button-color);
+    --m-button-hover-bg: transparent;
+    --m-button-active-bg: transparent;
 }
 
-.m-button--custom.m-button--ghost {
-    --m-button-bg: color-mix(
-        in srgb,
-        var(--m-button-color) 10%,
-        transparent
-    );
-    --m-button-fg: var(--m-button-color);
-    --m-button-border: transparent;
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-button-color) 16%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-button-color);
-    --m-button-hover-border: transparent;
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-button-color) 22%,
-        transparent
-    );
+.m-button--ghost.m-button--variant-solid,
+.m-button--ghost.m-button--variant-outlined,
+.m-button--ghost.m-button--variant-dashed {
+    --m-button-fg: var(--m-button-color-base);
+    --m-button-border: var(--m-button-color-base);
+    --m-button-hover-fg: var(--m-button-color-hover);
+    --m-button-hover-border: var(--m-button-color-hover);
+    --m-button-active-fg: var(--m-button-color-active, var(--m-button-color-hover));
+    --m-button-active-border: var(--m-button-color-active, var(--m-button-color-hover));
 }
-
-.m-button--custom.m-button--text,
-.m-button--custom.m-button--quaternary {
-    --m-button-bg: transparent;
-    --m-button-fg: var(--m-button-color);
-    --m-button-border: transparent;
-    --m-button-hover-bg: color-mix(
+.m-button--ghost.m-button--color-default {
+    --m-button-color-base: var(--m-color-on-emphasis);
+    --m-button-color-hover: color-mix(
         in srgb,
-        var(--m-button-color) 12%,
+        var(--m-color-on-emphasis) var(--m-button-ghost-hover-opacity),
         transparent
     );
-    --m-button-hover-fg: var(--m-button-color);
-    --m-button-hover-border: transparent;
+    --m-button-fg: var(--m-color-on-emphasis);
+    --m-button-border: var(--m-color-on-emphasis);
+    --m-button-hover-fg: var(--m-button-color-hover);
+    --m-button-hover-border: var(--m-button-color-hover);
 }
 
-.m-button--custom.m-button--plain {
-    --m-button-bg: color-mix(
-        in srgb,
-        var(--m-button-color) 10%,
-        transparent
-    );
-    --m-button-fg: var(--m-button-color);
-    --m-button-border: var(--m-button-color);
-    --m-button-hover-bg: color-mix(
-        in srgb,
-        var(--m-button-color) 16%,
-        transparent
-    );
-    --m-button-hover-fg: var(--m-button-color);
-    --m-button-hover-border: var(--m-button-color);
-    --m-button-active-bg: color-mix(
-        in srgb,
-        var(--m-button-color) 22%,
-        transparent
-    );
-}
+/* ---------- Size / shape / layout ---------- */
 
-.m-button--custom.m-button--link {
-    --m-button-bg: transparent;
-    --m-button-fg: var(--m-button-color);
-    --m-button-border: transparent;
-    --m-button-hover-bg: transparent;
-    --m-button-hover-fg: var(--m-button-color);
-    --m-button-hover-border: transparent;
-    --m-button-active-bg: transparent;
+.m-button--small {
+    --m-button-icon-size: var(--m-button-icon-size-small);
+    --m-button-font-size: var(--m-control-font-small);
+    --m-button-height: var(--m-control-height-small);
+    --m-button-padding-x: var(--m-button-padding-x-small);
 }
 
-.m-button-group {
-    display: inline-flex;
-    vertical-align: middle;
+.m-button--large {
+    --m-button-icon-size: var(--m-button-icon-size-large);
+    --m-button-font-size: var(--m-control-font-large);
+    --m-button-height: var(--m-control-height-large);
+    --m-button-padding-x: var(--m-button-padding-x-large);
 }
 
-.m-button-group--fluid {
+.m-button--block {
     display: flex;
     width: 100%;
 }
 
-.m-button-group--fluid > .m-button {
-    flex: 1;
-}
-
-.m-button-group > .m-button {
-    border-radius: 0;
-    margin: 0;
-}
-
-.m-button-group > .m-button + .m-button {
-    margin-left: calc(var(--m-border-width) * -1);
-}
-
-.m-button-group > .m-button:hover,
-.m-button-group > .m-button:focus-visible,
-.m-button-group > .m-button:active {
-    position: relative;
-    z-index: 1;
-}
-
-.m-button-group > .m-button:first-child {
-    border-top-left-radius: var(--m-radius-control);
-    border-bottom-left-radius: var(--m-radius-control);
-}
-
-.m-button-group > .m-button:last-child {
-    border-top-right-radius: var(--m-radius-control);
-    border-bottom-right-radius: var(--m-radius-control);
-}
-
-.m-button--raised {
-    box-shadow: var(--m-shadow-raised);
-}
-
-.m-button--raised:focus-visible {
-    box-shadow: var(--m-focus-shadow), var(--m-shadow-raised);
-}
-
-.m-button--rounded {
-    border-radius: var(--m-radius-full);
+.m-button--shape-round {
+    --m-button-radius: var(--m-radius-full);
+    padding-inline: calc(
+        var(--m-button-padding-x) + var(--m-button-padding-x-round-extra)
+    );
 }
 
 .m-button--shape-circle {
-    border-radius: var(--m-radius-full);
-    min-width: var(--m-control-height-medium);
+    --m-button-radius: var(--m-radius-full);
+    min-width: var(--m-button-height);
     padding-inline: 0;
-    width: var(--m-control-height-medium);
-}
-
-.m-button--shape-circle.m-button--small {
-    min-width: var(--m-control-height-small);
-    width: var(--m-control-height-small);
-}
-
-.m-button--shape-circle.m-button--large {
-    min-width: var(--m-control-height-large);
-    width: var(--m-control-height-large);
-}
-
-.m-button--shape-round {
-    border-radius: var(--m-radius-full);
-    padding-inline: calc(var(--m-button-padding-x-medium) + var(--m-space-2));
+    width: var(--m-button-height);
 }
 
 .m-button--shape-square {
-    border-radius: 0;
-}
-
-.m-button--dashed {
-    background: var(--m-color-surface);
-    border-style: dashed;
-    color: var(--m-color-text);
-}
-
-.m-button--dashed:not(:disabled):hover {
-    border-color: var(--m-color-primary-hover);
-    color: var(--m-color-primary-hover);
-}
-
-.m-button--primary.m-button--dashed {
-    --m-button-bg: var(--m-color-surface);
-    --m-button-fg: var(--m-color-primary);
-    --m-button-border: var(--m-color-primary);
-    --m-button-hover-bg: var(--m-color-surface);
-    --m-button-hover-fg: var(--m-color-primary-hover);
-    --m-button-hover-border: var(--m-color-primary-hover);
-    --m-button-active-bg: var(--m-color-surface);
-}
-
-.m-button--secondary.m-button--dashed {
-    --m-button-bg: var(--m-color-surface);
-    --m-button-fg: var(--m-color-text);
-    --m-button-border: var(--m-color-border);
-    --m-button-hover-bg: var(--m-color-surface);
-    --m-button-hover-fg: var(--m-color-primary-hover);
-    --m-button-hover-border: var(--m-color-primary-hover);
+    --m-button-radius: 0;
 }
 
 .m-button--icon-only {
     gap: 0;
-    min-width: var(--m-control-height-medium);
+    min-width: var(--m-button-height);
     padding: 0;
-    width: var(--m-control-height-medium);
-}
-
-.m-button--icon-only.m-button--small {
-    min-width: var(--m-control-height-small);
-    width: var(--m-control-height-small);
-}
-
-.m-button--icon-only.m-button--large {
-    min-width: var(--m-control-height-large);
-    width: var(--m-control-height-large);
+    width: var(--m-button-height);
 }
 
-.m-button--icon-right {
+.m-button--icon-end {
     flex-direction: row-reverse;
 }
 
-.m-button--icon-top {
-    flex-direction: column;
-    min-height: var(--m-button-icon-stack-min-height);
-    padding-block: var(--m-space-2);
-}
-
-.m-button--icon-bottom {
-    flex-direction: column-reverse;
-    min-height: var(--m-button-icon-stack-min-height);
-    padding-block: var(--m-space-2);
-}
-
-.m-button--fluid {
-    display: flex;
-    width: 100%;
+.m-button--two-chinese-chars > .m-button__label {
+    letter-spacing: var(--m-button-cn-letter-spacing);
+    margin-inline-end: calc(var(--m-button-cn-letter-spacing) * -1);
 }
 
-.m-button--small {
-    --m-button-icon-size: 0.875rem;
-    font-size: var(--m-control-font-small);
-    min-height: var(--m-control-height-small);
-    padding: 0 var(--m-button-padding-x-small);
+.m-button--loading {
+    cursor: default;
+    opacity: var(--m-button-loading-opacity);
+    pointer-events: none;
 }
 
-.m-button--large {
-    --m-button-icon-size: 1.25rem;
-    font-size: var(--m-control-font-large);
-    min-height: var(--m-control-height-large);
-    padding: 0 var(--m-button-padding-x-large);
-}
+/* ---------- Parts ---------- */
 
 .m-button__icon,
 .m-button__label {
@@ -2115,8 +1819,7 @@
 }
 
 .m-button__icon,
-.m-button__label,
-.m-button__badge {
+.m-button__label {
     position: relative;
     z-index: 1;
 }
@@ -2140,18 +1843,18 @@
     will-change: transform, opacity;
 }
 
-/* Used only when Web Animations API is unavailable. */
 .m-button__ripple-wave--fallback {
-    animation: m-button-ripple 560ms var(--m-motion-ease) forwards;
+    animation: m-button-ripple var(--m-button-ripple-duration)
+        var(--m-motion-ease) forwards;
 }
 
 @keyframes m-button-ripple {
     0% {
-        opacity: 0.42;
+        opacity: var(--m-button-ripple-opacity-start);
         transform: scale(0);
     }
     55% {
-        opacity: 0.22;
+        opacity: var(--m-button-ripple-opacity-mid);
         transform: scale(0.55);
     }
     100% {
@@ -2162,92 +1865,97 @@
 
 .m-button__icon {
     flex: 0 0 auto;
-    width: var(--m-button-icon-size);
     height: var(--m-button-icon-size);
     line-height: 0;
+    width: var(--m-button-icon-size);
 }
 
 .m-button__icon :is(.m-icon, .m-button__icon-graphic, svg) {
     display: block;
     flex-shrink: 0;
-    width: 100%;
     height: 100%;
+    width: 100%;
 }
 
 .m-button__icon .m-icon {
-    max-width: 100%;
     max-height: 100%;
+    max-width: 100%;
 }
 
-.m-button__badge {
-    align-items: center;
-    background: var(--m-color-contrast);
+.m-button__spinner {
+    animation: m-button-spin var(--m-motion-spin-fast) linear infinite;
+    border: var(--m-button-spinner-border-width) solid currentColor;
     border-radius: var(--m-radius-full);
-    color: var(--m-color-contrast-fg);
-    display: inline-flex;
-    font-size: var(--m-font-size-xs);
-    font-weight: 700;
-    justify-content: center;
-    line-height: 1;
-    margin-inline-start: var(--m-space-1);
-    min-width: var(--m-button-badge-min-width);
-    padding: var(--m-space-1) var(--m-space-2);
+    border-right-color: transparent;
+    height: var(--m-button-spinner-size);
+    width: var(--m-button-spinner-size);
 }
 
-.m-button__badge--secondary {
-    background: color-mix(
-        in srgb,
-        var(--m-color-text-muted) 25%,
-        var(--m-color-surface)
-    );
-    color: var(--m-color-text);
+@keyframes m-button-spin {
+    to {
+        transform: rotate(360deg);
+    }
 }
 
-.m-button__badge--success {
-    background: var(--m-color-success);
-    color: var(--m-color-on-emphasis);
+@media (prefers-reduced-motion: reduce) {
+    .m-button {
+        --m-button-ripple-duration: 0ms;
+        transition-duration: 0ms;
+    }
+
+    .m-button__spinner {
+        animation-duration: 0ms;
+    }
 }
 
-.m-button__badge--info {
-    background: var(--m-color-info);
-    color: var(--m-color-on-emphasis);
+:root[data-m-motion='reduced'] .m-button {
+    --m-button-ripple-duration: 280ms;
+    --m-button-press-duration: 120ms;
 }
 
-.m-button__badge--warn {
-    background: var(--m-color-warn);
-    color: var(--m-color-on-emphasis);
+:root[data-m-motion='none'] .m-button {
+    --m-button-ripple-duration: 0ms;
+    --m-button-press-duration: 0ms;
 }
 
-.m-button__badge--danger {
-    background: var(--m-color-danger);
-    color: var(--m-color-on-emphasis);
+/* ---------- Group ---------- */
+
+.m-button-group {
+    display: inline-flex;
+    vertical-align: middle;
 }
 
-.m-button__badge--contrast {
-    background: var(--m-color-contrast);
-    color: var(--m-color-contrast-fg);
+.m-button-group--block {
+    display: flex;
+    width: 100%;
 }
 
-.m-button__spinner {
-    animation: m-button-spin var(--m-motion-spin-fast) linear infinite;
-    border: 2px solid currentColor;
-    border-right-color: transparent;
-    border-radius: var(--m-radius-full);
-    height: var(--m-button-spinner-size);
-    width: var(--m-button-spinner-size);
+.m-button-group--block > .m-button {
+    flex: 1;
 }
 
-@keyframes m-button-spin {
-    to {
-        transform: rotate(360deg);
-    }
+.m-button-group > .m-button {
+    border-radius: 0;
+    margin: 0;
 }
 
-[data-m-motion="reduced"] .m-button__spinner,
-[data-m-motion="none"] .m-button__spinner {
-    animation: none;
+.m-button-group > .m-button + .m-button {
+    margin-inline-start: calc(var(--m-border-width) * -1);
 }
 
-[data-m-motion="none"] .m-button__ripple-wave {
-    display: none;
+.m-button-group > .m-button:hover,
+.m-button-group > .m-button:focus-visible,
+.m-button-group > .m-button:active {
+    position: relative;
+    z-index: 1;
+}
+
+.m-button-group > .m-button:first-child {
+    border-end-start-radius: var(--m-radius-control);
+    border-start-start-radius: var(--m-radius-control);
+}
+
+.m-button-group > .m-button:last-child {
+    border-end-end-radius: var(--m-radius-control);
+    border-start-end-radius: var(--m-radius-control);
 }