@swiftwc/ui 0.0.0-dev.22 → 0.0.0-dev.24

package/generated/internal/utils/button-role.d.ts

@@ -1 +1 @@
-export default function (target: HTMLElement, attributeName: string | null): void;
+export default function (target: HTMLElement, role: string | null): void;

package/generated/internal/utils/button-role.js

@@ -18,6 +18,10 @@ function renderPlaceholder(el, role) {
             label.setAttribute('title', I18n.t('ButtonRole').Default.Confirm);
             label.setAttribute('system-image', Snapshot.config['confirm-button-icon']);
             break;
+        case 'confirmation-action':
+            label.setAttribute('title', I18n.t('ButtonRole').Default.Confirm);
+            label.setAttribute('system-image', Snapshot.config['confirm-button-icon']);
+            break;
         case 'destructive':
             label.setAttribute('title', I18n.t('ButtonRole').Default.Destructive);
             label.setAttribute('system-image', Snapshot.config['delete-button-icon']);
@@ -30,10 +34,10 @@ function renderPlaceholder(el, role) {
     //   label.setAttribute('title', I18n.t('ButtonRole').Default.Destructive)
     // } else label?.remove()
 }
-export default function (target, attributeName) {
-    renderPlaceholder(target, target.getAttribute(attributeName ?? ''));
+export default function (target, role) {
+    renderPlaceholder(target, role);
     CleanupRegistry.unregister(target, 'i18n');
     CleanupRegistry.register(target, onoff('localechange', () => {
-        renderPlaceholder(target, target.getAttribute(attributeName ?? ''));
+        renderPlaceholder(target, role);
     }, I18n.on).on(), 'i18n');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swiftwc/ui",
-  "version": "0.0.0-dev.22",
+  "version": "0.0.0-dev.24",
   "description": "Elegant SwiftUI-inspired web components for standalone web apps and web extensions.",
   "publishConfig": {
     "access": "public"

package/scss/_components.scss

@@ -10,6 +10,9 @@
 @forward 'components/full-screen';
 
 @forward 'components/detail-placeholder';
+@forward 'components/progress-view';
+
+@forward 'components/fine-tooltip';
 
 @forward 'components/sticky-container';
 

package/scss/_mixins.scss

@@ -1,3 +1,7 @@
 @forward 'mixins/index';
 
 @forward 'mixins/dialog';
+
+@forward 'mixins/button';
+
+@forward 'mixins/color';

package/scss/_transitions.scss

@@ -10,8 +10,12 @@
 
 @forward 'transitions/dialog';
 
+@forward 'transitions/fine-tooltip';
+
 @forward 'transitions/menu-view';
 
+@forward 'transitions/progress-view';
+
 @forward 'transitions/glass-button';
 
 @forward 'transitions/glass-prominent-button';

package/scss/base/_reboot.scss

@@ -43,6 +43,7 @@
     text-transform: none;
   }
 
+  // FIXME:
   .ph,
   .ph::before {
     display: grid;
@@ -110,6 +111,10 @@
 
   html {
     transition: font-size 1ms step-start;
+
+    @media (pointer: fine) {
+      font-size: 14px;
+    }
   }
 
   // label {

package/scss/base/_root.scss

@@ -1,6 +1,7 @@
 @use '../vars';
 @use '../mixins';
 @use 'sass:map';
+@use 'sass:string';
 
 @property --root-font-size {
   syntax: '<number>';
@@ -61,8 +62,27 @@
       --liquid-glass-bg-alpha: 99%;
       --liquid-glass-bg-alpha-dark: 99%;
     }
+    //
     --liquid-glass-bg: oklch(var(--liquid-glass-bg-lch) / var(--liquid-glass-bg-alpha));
     --liquid-glass-bg-dark: oklch(var(--liquid-glass-bg-lch-dark) / var(--liquid-glass-bg-alpha-dark));
+
+    --clear-glass-bg: var(--liquid-glass-bg);
+    --clear-glass-bg-dark: var(--liquid-glass-bg-dark);
+    --clear-glass-focus-bg: var(--clear-glass-bg);
+    --clear-glass-focus-bg-dark: var(--clear-glass-bg-dark);
+    --clear-glass-active-bg: var(--clear-glass-bg);
+    --clear-glass-active-bg-dark: var(--clear-glass-bg-dark);
+
+    // @include mixins.wire-tinted-glass(tinted-glass-bg, tinted-glass-focus-bg, tinted-glass-active-bg);
+
+    // This is for glass effect on interactive elements like controls that supports hover on fine screens and active state!
+    // NOTE: On fine screens this fallbacks/transforms into a basic color w/out glass efect!
+    --control-clear-glass-bg: var(--liquid-glass-bg);
+    --control-clear-glass-bg-dark: var(--liquid-glass-bg-dark);
+    --control-clear-glass-focus-bg: var(--control-clear-glass-bg);
+    --control-clear-glass-focus-bg-dark: var(--control-clear-glass-bg-dark);
+    --control-clear-glass-active-bg: var(--control-clear-glass-bg);
+    --control-clear-glass-active-bg-dark: var(--control-clear-glass-bg-dark);
     //color-mix(in oklch, red calc(100% - 50%), transparent)
 
     // --sidebar-bg-lch: 1 0 0;
@@ -83,22 +103,24 @@
       var(--liquid-glass-bs-bevel-highlight), var(--liquid-glass-bs-soft-bevel-blur), inset 3px 3px 10px -3px light-dark(#ddd, #262626), inset -3px -3px 10px -3px light-dark(#ddd, #262626),
       inset 0 0 5px 1px light-dark(#fff, #141414), inset 0 0 0 0.5px light-dark(#00000040, #ffffff26), inset 0 0 24px 0 light-dark(#0000001a, #ffffff0d), var(--liquid-glass-bs-outer);
 
+    --control-clear-glass-box-shadow: var(--liquid-glass-box-shadow);
+
     --navigation-bar-block-size: var(--tool-bar-block-size);
 
     --nav-split-view-sidebar-inline-size: 20rem;
     --nav-split-view-content-inline-size: 25rem;
 
-    --nav-split-view-separator-color: var(--divider); //oklch(0 0 0);
-    --nav-split-view-separator-color-dark: var(--divider-dark); //oklch(1 0 0);
+    // --nav-split-view-separator-color: var(--divider); //var(--black);
+    // --nav-split-view-separator-color-dark: var(--divider-dark); //var(--white);
 
-    --primary-label: oklch(0 0 0);
-    --primary-label-dark: oklch(1 0 0);
+    // --primary-label: var(--black);
+    // --primary-label-dark: var(--white);
 
     // --secondary-label: oklch(0.4962 0 0); // ✅
     // --secondary-label-dark: oklch(0.6334 0 0); // ✅
 
-    --secondary-text: oklch(0 0 0);
-    --secondary-text-dark: oklch(1 0 0);
+    --secondary-text: var(--black);
+    --secondary-text-dark: var(--white);
 
     --tint: oklch(0.5325 0.1899 257.12);
     --tint1g: color-mix(in oklch, white 70%, var(--tint)); //oklch(0.9208 0.0306 249.69);
@@ -110,16 +132,16 @@
     // --tint-lch: 0.452 0.313214 264.052;
     // --tint-lch-dark: 0.452 0.313214 264.052;
 
-    --divider: oklch(0.9431 0 0); // ✅
-    --divider-dark: oklch(0.2858 0.0036 286.17); // ✅
+    // --divider: oklch(0.9431 0 0); // ✅
+    // --divider-dark: oklch(0.2858 0.0036 286.17); // ✅
 
-    --system-bg: oklch(1 0 0); // ✅
-    --system-bg-dark: oklch(0 0 0); // ✅
+    --system-bg: var(--white); // ✅
+    --system-bg-dark: var(--black); // ✅
 
-    --primary-bg: oklch(0.9566 0.0067 286.27); // ✅
-    --primary-bg-dark: oklch(0 0 0); // ✅
+    // --primary-bg: oklch(0.9566 0.0067 286.27); // ✅
+    // --primary-bg-dark: var(--black); // ✅
 
-    --primary-grouped-bg: oklch(1 0 0); //0.8136 0.0428 255.03;
+    --primary-grouped-bg: var(--white); //0.8136 0.0428 255.03;
     --primary-grouped-bg-dark: oklch(0.8136 0.0428 255.03);
 
     --secondary-bg: oklch(0.8045 0.0779 73.42);
@@ -145,8 +167,8 @@
     --clear: transparent;
 
     --toolbar-col-gap: 0.5rem;
-    --toolbar-cell-bg: var(--liquid-glass-bg); //oklch(var(--sidebar-bg-lch) / var(--sidebar-bg-alpha)); //oklch(0 0 0 / 0%);
-    --toolbar-cell-bg-dark: var(--liquid-glass-bg-dark); //oklch(var(--sidebar-bg-lch-dark) / var(--sidebar-bg-alpha-dark)); //oklch(0 0 0 / 0%);
+    --toolbar-cell-bg: var(--control-clear-glass-bg); //oklch(var(--sidebar-bg-lch) / var(--sidebar-bg-alpha)); //oklch(0 0 0 / 0%);
+    --toolbar-cell-bg-dark: var(--control-clear-glass-bg-dark); //oklch(var(--sidebar-bg-lch-dark) / var(--sidebar-bg-alpha-dark)); //oklch(0 0 0 / 0%);
     --toolbar-cell-inline-padding-start: 0.25rem;
     --toolbar-cell-inline-padding-end: 0.25rem;
     --toolbar-cell-block-padding-start: 0.25rem;
@@ -154,22 +176,23 @@
     --toolbar-cell-border-radius: var(--pill-border-radius);
     --toolbar-cell-min-size: 2.8rem;
 
-    --toolbar-cell-focus-bg: var(--toolbar-cell-bg); //oklch(0 0 0 / 0%);
-    --toolbar-cell-focus-bg-dark: var(--toolbar-cell-bg-dark); //oklch(0 0 0 / 0%);
-    --toolbar-cell-active-bg: var(--toolbar-cell-bg); //oklch(0 0 0 / 0%);
-    --toolbar-cell-active-bg-dark: var(--toolbar-cell-bg-dark); //oklch(0 0 0 / 0%);
+    --toolbar-cell-focus-bg: var(--control-clear-glass-focus-bg); //oklch(0 0 0 / 0%);
+    --toolbar-cell-focus-bg-dark: var(--control-clear-glass-focus-bg-dark); //oklch(0 0 0 / 0%);
+    --toolbar-cell-active-bg: var(--control-clear-glass-active-bg); //oklch(0 0 0 / 0%);
+    --toolbar-cell-active-bg-dark: var(--control-clear-glass-active-bg-dark); //oklch(0 0 0 / 0%);
+
+    --toolbar-cell-box-shadow: var(--control-clear-glass-box-shadow);
 
-    --toolbar-cell-box-shadow: var(--liquid-glass-box-shadow);
+    --menu-bg: var(--control-clear-glass-bg); //--menu-bg: var(--liquid-glass-bg); //oklch(var(--sidebar-bg-lch) / var(--sidebar-bg-alpha));
+    --menu-bg-dark: var(--control-clear-glass-bg-dark); //--menu-bg-dark: var(--liquid-glass-bg-dark); //oklch(var(--sidebar-bg-lch-dark) / var(--sidebar-bg-alpha-dark));
 
-    --menu-bg: var(--liquid-glass-bg); //oklch(var(--sidebar-bg-lch) / var(--sidebar-bg-alpha));
-    --menu-bg-dark: var(--liquid-glass-bg-dark); //oklch(var(--sidebar-bg-lch-dark) / var(--sidebar-bg-alpha-dark));
     --menu-max-inline-size: 15rem;
     --menu-max-block-size: 60vh;
     --menu-spacing: 1rem;
     --menu-host-offscreen-transform: scale(0);
     --menu-host-offscreen-filter: blur(10px);
 
-    --menu-popover-box-shadow: var(--liquid-glass-box-shadow);
+    --menu-popover-box-shadow: var(--control-clear-glass-box-shadow);
 
     --menu-padding: 0.5rem;
 
@@ -180,12 +203,6 @@
 
     --menu-item-border-radius: 1.2rem; // define this to be like a pill, based on an exemplar item min-height
 
-    --menu-item-focus-bg: oklch(0 0 0 / 0%);
-    --menu-item-focus-bg-dark: oklch(0 0 0 / 0%);
-
-    --menu-item-active-bg: oklch(0 0 0 / 20%);
-    --menu-item-active-bg-dark: oklch(1 0 0 / 20%);
-
     --touchglass-transition-duration: 300ms;
     // --touchglass-transition-duration: 15s;
 
@@ -304,13 +321,6 @@
     --table-accessory-gap: 0.2rem;
     --table-accessory-size: 1.2rem;
 
-    --glass-btn-bg: var(--liquid-glass-bg);
-    --glass-btn-bg-dark: var(--liquid-glass-bg-dark);
-    --glass-btn-focus-bg: var(--glass-btn-bg);
-    --glass-btn-focus-bg-dark: var(--glass-btn-bg-dark);
-    --glass-btn-active-bg: var(--glass-btn-bg);
-    --glass-btn-active-bg-dark: var(--glass-btn-bg-dark);
-
     // button sizes 1/2
     @each $size, $media in vars.$button-sizes {
       $props: map.get($media, default);
@@ -322,6 +332,11 @@
       }
     }
 
+    --picker-affordance-size: 1rem;
+    --picker-affordance-col-gap: 1rem;
+
+    // SECTION
+
     // fine
     @media (pointer: fine) {
       // button sizes 2/2
@@ -335,47 +350,29 @@
         }
       }
 
-      --primary-bg: oklch(0.9761 0 0); // ✅
-      --primary-bg-dark: oklch(0.2666 0.0071 67.52); // ✅
+      // --primary-bg: oklch(0.9761 0 0); // ✅
+      // --primary-bg-dark: oklch(0.2666 0.0071 67.52); // ✅
 
-      --divider: oklch(0.9249 0 0); // ✅
-      --divider-dark: oklch(0.3452 0.0074 84.59); // ✅
+      // --divider: oklch(0.9249 0 0); // ✅
+      // --divider-dark: oklch(0.3452 0.0074 84.59); // ✅
 
       // --secondary-label: oklch(0.5999 0 0); // ✅
       // --secondary-label-dark: oklch(0.69 0.0019 67.79); // ✅
 
-      --noglass-bg: oklch(1 0 0);
-      --noglass-bg-dark: oklch(0.2871 0.0029 17.33);
+      // SECTION Glass
 
-      --toolbar-cell-bg: var(--noglass-bg);
-      --toolbar-cell-bg-dark: var(--noglass-bg-dark);
+      --control-clear-glass-bg: var(--white);
+      --control-clear-glass-bg-dark: oklch(0.2871 0.0029 17.33);
+      --control-clear-glass-focus-bg: var(--gray5); //oklch(0.9551 0 0); //FIXME: gray6!!!
+      --control-clear-glass-focus-bg-dark: oklch(0.3578 0.008 75.3); //FIXME: gray4!!!
+      --control-clear-glass-active-bg: var(--gray3); //oklch(0.9128 0 0); //FIXME: gray5!!!
+      --control-clear-glass-active-bg-dark: oklch(0.3995 0.0077 75.32); //FIXME: gray3!!!
 
-      --toolbar-cell-focus-bg: oklch(0.9551 0 0); //FIXME: gray6!!!
-      --toolbar-cell-focus-bg-dark: oklch(0.3578 0.008 75.3); //FIXME: gray4!!!
-      --toolbar-cell-active-bg: oklch(0.9128 0 0); //FIXME: gray5!!!
-      --toolbar-cell-active-bg-dark: oklch(0.3995 0.0077 75.32); //FIXME: gray3!!!
+      --control-clear-glass-box-shadow: var(--liquid-glass-bs-bevel-highlight), var(--liquid-glass-bs-soft-bevel-blur), var(--liquid-glass-bs-outer);
 
-      --menu-bg: var(--noglass-bg);
-      --menu-bg-dark: var(--noglass-bg-dark);
-
-      --toolbar-cell-box-shadow: var(--liquid-glass-bs-bevel-highlight), var(--liquid-glass-bs-soft-bevel-blur), var(--liquid-glass-bs-outer);
-      --menu-popover-box-shadow: var(--liquid-glass-bs-bevel-highlight), var(--liquid-glass-bs-soft-bevel-blur), var(--liquid-glass-bs-outer);
+      // SECTION
 
       //
-      --menu-item-focus-color: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
-      --menu-item-focus-color-dark: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
-
-      --menu-item-active-color: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
-      --menu-item-active-color-dark: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
-
-      --menu-item-focus-bg: var(--accentColor);
-      --menu-item-focus-bg-dark: var(--accentColor);
-
-      --menu-item-active-bg: oklch(from var(--accentColor) max(calc(l * 0.7), 0) min(calc(c * 1.4), c) h); //color-mix(in oklch, black 10%, var(--accentColor));
-      --menu-item-active-bg-dark: oklch(from var(--accentColor) min(calc(l * 1.3), 1) min(calc(c * 1.2), c) h); //color-mix(in oklch, white 10%, var(--accentColor));
-
-      --picker-affordance-size: 1rem;
-      --picker-affordance-col-gap: 1rem;
 
       // list
       // @each $v in list, form {

package/scss/colors/_index.scss

@@ -417,6 +417,12 @@ $colors: map.merge(
   inherits: true;
 }
 
+@property --clear {
+  syntax: '<color>';
+  initial-value: oklch(0 0 0 / 0%); // ✅
+  inherits: true;
+}
+
 @layer #{vars.$colors-layer} {
   :root {
     // --background: light-dark(oklch(1 0 0), oklch(0 0 0)); // ✅
@@ -510,17 +516,13 @@ $colors: map.merge(
       //   // --toolbaritemtext: light-dark(var(--primary-label), var(--primary-label-dark));
       // }
     }
-    :where(&[tint]) {
-      --toolbaritemtext: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
-      --toolbaritemhighlighttext: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
-      --toolbaritemactivetext: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
-
-      --toolbaritemface: var(--accentColor); //light-dark(var(--accentColor), var(--accentColor));
-      --toolbaritemhighlightface: light-dark(
-        oklch(from var(--accentColor) min(calc(l * 1.1), 1) min(calc(c * 1.1), c) h),
-        oklch(from var(--accentColor) min(calc(l * 1.1), 1) min(calc(c * 1.1), c) h)
-      );
-      --toolbaritemactiveface: light-dark(oklch(from var(--accentColor) min(calc(l * 1.2), 1) min(calc(c * 1.1), c) h), oklch(from var(--accentColor) min(calc(l * 1.2), 1) min(calc(c * 1.1), c) h));
+
+    :where(&[tint], [tint] &) {
+      // --toolbaritemtext: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
+      // --toolbaritemhighlighttext: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
+      // --toolbaritemactivetext: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
+
+      @include mixins.wire-tinted-glass(toolbaritem);
     }
   }
 
@@ -531,12 +533,12 @@ $colors: map.merge(
   //   }
   // }
 
-  sidebar-toggle,
+  sidebar-toggle {
     // tool-bar-item,
     // [is='tab-item'],
     // list-view > button,
     // this is temp for toolbar look aboove tables
-    menu-view {
+    // menu-view {
     // [is='disclosure-group'] {
     :where(&) {
       --toolbaritemhighlightface: light-dark(var(--toolbar-cell-focus-bg), var(--toolbar-cell-focus-bg-dark));
@@ -546,12 +548,43 @@ $colors: map.merge(
 
   menu-view {
     :where(&) {
-      --menuitemhighlighttext: light-dark(var(--menu-item-focus-color), var(--menu-item-focus-color-dark));
-      --menuitemhighlightface: light-dark(var(--menu-item-focus-bg), var(--menu-item-focus-bg-dark));
+      --menuitemhighlightface: light-dark(var(--clear), var(--clear));
+
+      --menuitemactiveface: light-dark(oklch(0 0 0 / 20%), oklch(1 0 0 / 20%));
+
+      @media (pointer: fine) {
+        --menuitemhighlightface: light-dark(var(--accentColor), var(--accentColor));
+
+        --menuitemhighlighttext: light-dark(oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none), oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none));
+
+        --menuitemactivetext: light-dark(oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none), oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none));
 
-      --menuitemactivetext: light-dark(var(--menu-item-active-color), var(--menu-item-active-color-dark));
-      --menuitemactiveface: light-dark(var(--menu-item-active-bg), var(--menu-item-active-bg-dark));
+        --menuitemactiveface: light-dark(
+          oklch(from var(--accentColor) max(calc(l * 0.7), 0) min(calc(c * 1.4), c) h),
+          oklch(from var(--accentColor) min(calc(l * 1.3), 1) min(calc(c * 1.2), c) h)
+        ); //color-mix(in oklch, black 10%, var(--accentColor)); //color-mix(in oklch, white 10%, var(--accentColor));
+      }
+
+      --menusummaryhighlightface: light-dark(var(--toolbar-cell-focus-bg), var(--toolbar-cell-focus-bg-dark));
+      --menusummaryactiveface: light-dark(var(--toolbar-cell-active-bg), var(--toolbar-cell-active-bg-dark));
+    }
+
+    tool-bar-item > picker-view > &,
+    tool-bar-item > & {
+      :where(&) {
+        --menusummaryface: var(--toolbaritemface);
+        --menusummaryhighlightface: var(--toolbaritemhighlightface);
+        --menusummaryactiveface: var(--toolbaritemactiveface);
+        --menusummarytext: var(--toolbaritemtext);
+        --menusummaryhighlighttext: var(--toolbaritemhighlighttext);
+        --menusummaryactivetext: var(--toolbaritemactivetext);
+      }
     }
+
+    // :where(&[tint]) {
+    // @include mixins.wire-tinted-menu(menuitemface, menuitemhighlightface, menuitemactiveface);
+    // @include mixins.wire-menu-colors;
+    // }
   }
 
   :where([is='confirmation-dialog'], [is='alert-dialog']) {
@@ -575,25 +608,34 @@ $colors: map.merge(
   }
 
   :where([is='bordered-button']) {
-    --btntext: var(--accentEmphasis, var(--accentColor));
+    --btntext: var(--accentColorEffective, var(--accentColor));
     --btnhighlighttext: light-dark(
-      oklch(from var(--accentEmphasis, var(--accentColor)) max(calc(l * 0.7), 0) min(calc(c * 1.4), c) h),
-      oklch(from var(--accentEmphasis, var(--accentColor)) min(calc(l * 1.2), 1) min(calc(c * 1.4), c) h)
+      oklch(from var(--accentColorEffective, var(--accentColor)) max(calc(l * 0.7), 0) min(calc(c * 1.4), c) h),
+      oklch(from var(--accentColorEffective, var(--accentColor)) min(calc(l * 1.2), 1) min(calc(c * 1.4), c) h)
     );
     --btnactivetext: light-dark(
-      oklch(from var(--accentEmphasis, var(--accentColor)) max(calc(l * 0.5), 0) min(calc(c * 1.4), c) h),
-      oklch(from var(--accentEmphasis, var(--accentColor)) min(calc(l * 1.3), 1) min(calc(c * 1.4), c) h)
+      oklch(from var(--accentColorEffective, var(--accentColor)) max(calc(l * 0.5), 0) min(calc(c * 1.4), c) h),
+      oklch(from var(--accentColorEffective, var(--accentColor)) min(calc(l * 1.3), 1) min(calc(c * 1.4), c) h)
     );
 
-    --btnface: light-dark(var(--accentSubtle, oklch(from var(--accentColor4) l 0 h)), var(--accentSubtle, oklch(from var(--accentColor4) l 0 h)));
+    --btnface: light-dark(var(--accentColorEffective4, oklch(from var(--accentColor4) l 0 h)), var(--accentColorEffective4, oklch(from var(--accentColor4) l 0 h)));
     --btnhighlightface: light-dark(
-      oklch(from var(--accentSubtle, oklch(from var(--accentColor4) l 0 h)) max(calc(l * 0.95), 0) min(calc(c * 1.8), c) h),
-      oklch(from var(--accentSubtle, oklch(from var(--accentColor4) l 0 h)) min(calc(l * 1.2), 1) min(calc(c * 1.8), c) h)
+      oklch(from var(--accentColorEffective4, oklch(from var(--accentColor4) l 0 h)) max(calc(l * 0.95), 0) min(calc(c * 1.8), c) h),
+      oklch(from var(--accentColorEffective4, oklch(from var(--accentColor4) l 0 h)) min(calc(l * 1.2), 1) min(calc(c * 1.8), c) h)
     );
     --btnactiveface: light-dark(
-      oklch(from var(--accentSubtle, oklch(from var(--accentColor4) l 0 h)) max(calc(l * 0.9), 0) min(calc(c * 1.8), c) h),
-      oklch(from var(--accentSubtle, oklch(from var(--accentColor4) l 0 h)) min(calc(l * 1.3), 1) min(calc(c * 1.8), c) h)
+      oklch(from var(--accentColorEffective4, oklch(from var(--accentColor4) l 0 h)) max(calc(l * 0.9), 0) min(calc(c * 1.8), c) h),
+      oklch(from var(--accentColorEffective4, oklch(from var(--accentColor4) l 0 h)) min(calc(l * 1.3), 1) min(calc(c * 1.8), c) h)
     );
+    // --btnface: light-dark(var(--accentSubtle, oklch(from var(--accentColor4) l 0 h)), var(--accentSubtle, oklch(from var(--accentColor4) l 0 h)));
+    // --btnhighlightface: light-dark(
+    //   oklch(from var(--accentSubtle, oklch(from var(--accentColor4) l 0 h)) max(calc(l * 0.95), 0) min(calc(c * 1.8), c) h),
+    //   oklch(from var(--accentSubtle, oklch(from var(--accentColor4) l 0 h)) min(calc(l * 1.2), 1) min(calc(c * 1.8), c) h)
+    // );
+    // --btnactiveface: light-dark(
+    //   oklch(from var(--accentSubtle, oklch(from var(--accentColor4) l 0 h)) max(calc(l * 0.9), 0) min(calc(c * 1.8), c) h),
+    //   oklch(from var(--accentSubtle, oklch(from var(--accentColor4) l 0 h)) min(calc(l * 1.3), 1) min(calc(c * 1.8), c) h)
+    // );
   }
 
   :where([is='bordered-prominent-button']) {
@@ -607,29 +649,27 @@ $colors: map.merge(
   }
 
   :where([is='glass-button']) {
-    --btntext: var(--accentEmphasis, var(--accentColor));
+    --btntext: var(--accentColorEffective, var(--accentColor));
     --btnhighlighttext: light-dark(
-      oklch(from var(--accentEmphasis, var(--accentColor)) min(calc(l * 1.1), 1) min(calc(c * 1.1), c) h),
-      oklch(from var(--accentEmphasis, var(--accentColor)) min(calc(l * 1.1), 1) min(calc(c * 1.1), c) h)
+      oklch(from var(--accentColorEffective, var(--accentColor)) min(calc(l * 1.1), 1) min(calc(c * 1.1), c) h),
+      oklch(from var(--accentColorEffective, var(--accentColor)) min(calc(l * 1.1), 1) min(calc(c * 1.1), c) h)
     );
     --btnactivetext: light-dark(
-      oklch(from var(--accentEmphasis, var(--accentColor)) min(calc(l * 1.2), 1) min(calc(c * 1.1), c) h),
-      oklch(from var(--accentEmphasis, var(--accentColor)) min(calc(l * 1.2), 1) min(calc(c * 1.1), c) h)
+      oklch(from var(--accentColorEffective, var(--accentColor)) min(calc(l * 1.2), 1) min(calc(c * 1.1), c) h),
+      oklch(from var(--accentColorEffective, var(--accentColor)) min(calc(l * 1.2), 1) min(calc(c * 1.1), c) h)
     );
 
-    --btnface: light-dark(var(--glass-btn-bg), var(--glass-btn-bg-dark));
-    --btnhighlightface: light-dark(var(--glass-btn-focus-bg), var(--glass-btn-focus-bg-dark));
-    --btnactiveface: light-dark(var(--glass-btn-active-bg), var(--glass-btn-active-bg-dark));
+    --btnface: light-dark(var(--clear-glass-bg), var(--clear-glass-bg-dark));
+    --btnhighlightface: light-dark(var(--clear-glass-focus-bg), var(--clear-glass-focus-bg-dark));
+    --btnactiveface: light-dark(var(--clear-glass-active-bg), var(--clear-glass-active-bg-dark));
   }
 
   :where([is='glass-prominent-button']) {
-    --btntext: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
-    --btnhighlighttext: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
-    --btnactivetext: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
+    // --btntext: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
+    // --btnhighlighttext: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
+    // --btnactivetext: oklch(from var(--accentColor) clamp(0, (0.7 - l) * 999, 1) none none);
 
-    --btnface: var(--accentColor); //light-dark(var(--accentColor), var(--accentColor));
-    --btnhighlightface: light-dark(oklch(from var(--accentColor) min(calc(l * 1.1), 1) min(calc(c * 1.1), c) h), oklch(from var(--accentColor) min(calc(l * 1.1), 1) min(calc(c * 1.1), c) h));
-    --btnactiveface: light-dark(oklch(from var(--accentColor) min(calc(l * 1.2), 1) min(calc(c * 1.1), c) h), oklch(from var(--accentColor) min(calc(l * 1.2), 1) min(calc(c * 1.1), c) h));
+    @include mixins.wire-tinted-glass(btn);
   }
 
   /* list-view {

package/scss/components/_alert-dialog.scss

@@ -18,14 +18,13 @@
       max-inline-size: min(20rem, 80vw);
       max-block-size: 80vh;
 
-      margin-block: max(env(safe-area-inset-top), var(--menu-spacing)) max(env(safe-area-inset-bottom), var(--menu-spacing));
-      margin-inline: max(env(safe-area-inset-left), var(--menu-spacing)) max(env(safe-area-inset-right), var(--menu-spacing));
+      margin-block: auto;
+      margin-inline: auto;
 
       transform: var(--alert--dialog-scale,);
       opacity: var(--alert--dialog-opacity,);
 
-      position-anchor: --alert-dialog; // overriden
-      position-area: center;
+      place-self: center;
 
       overflow: clip;
       border-radius: 0.9rem;
@@ -34,7 +33,7 @@
       box-shadow: var(--menu-popover-box-shadow,); //0 0 10px 10px black;
 
       padding-block: 1rem;
-      padding-inline: 1em;
+      padding-inline: 1rem;
       gap: 1rem;
 
       // finally

package/scss/components/_bordered-button.scss

@@ -26,6 +26,9 @@
     }
 
     :where(&[role='destructive']) {
+      --accentColorEffective: var(--red);
+      --accentColorEffective4: var(--red4);
+
       --accentColor: var(--red);
       --accentColor2: var(--red2);
       --accentColor3: var(--red3);

package/scss/components/_bordered-prominent-button.scss

@@ -22,6 +22,9 @@
     }
 
     :where(&[role='destructive']) {
+      --accentColorEffective: var(--red);
+      --accentColorEffective4: var(--red4);
+
       --accentColor: var(--red);
       --accentColor2: var(--red2);
       --accentColor3: var(--red3);

package/scss/components/_borderless-button.scss

@@ -13,6 +13,9 @@
     }
 
     :where(&[role='destructive']) {
+      --accentColorEffective: var(--red);
+      --accentColorEffective4: var(--red4);
+
       --accentColor: var(--red);
       --accentColor2: var(--red2);
       --accentColor3: var(--red3);

package/scss/components/_confirmation-dialog.scss

@@ -33,7 +33,7 @@
       box-shadow: var(--menu-popover-box-shadow,); //0 0 10px 10px black;
 
       padding-block: 1rem;
-      padding-inline: 1em;
+      padding-inline: 1rem;
       gap: 0.5rem;
 
       // finally

package/scss/components/_content-unavailable-view.scss

@@ -25,7 +25,7 @@
     > :not([slot]) {
       --label-image-size: 5;
 
-      --label-gap: 1rem;
+      --label-gap: 1;
 
       // --label-font: title3;
     }