diff --git a/src/browser/base/content/zen-panels/theme-picker.inc b/src/browser/base/content/zen-panels/theme-picker.inc index ff059d959..524126c55 100644 --- a/src/browser/base/content/zen-panels/theme-picker.inc +++ b/src/browser/base/content/zen-panels/theme-picker.inc @@ -131,10 +131,10 @@ diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css index d9687232d..ebb89c8e7 100644 --- a/src/zen/common/styles/zen-single-components.css +++ b/src/zen/common/styles/zen-single-components.css @@ -185,7 +185,7 @@ .toolbarbutton-1:not(#tabs-newtab-button), .urlbar-page-action, .identity-box-button { - --tab-border-radius: 6px; + --tab-border-radius: 8px; --toolbarbutton-border-radius: var(--tab-border-radius); --toolbarbutton-inner-padding: 6px; --toolbarbutton-outer-padding: 1px; diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css index 815dd2a34..d9c22135f 100644 --- a/src/zen/common/styles/zen-theme.css +++ b/src/zen/common/styles/zen-theme.css @@ -213,6 +213,8 @@ --toolbarbutton-border-radius: 6px; --urlbar-margin-inline: 1px !important; + --zen-squircle-value: 1.3; + --tab-icon-overlay-stroke: light-dark(white, black) !important; --tab-close-button-padding: 4px !important; @@ -343,3 +345,7 @@ } %include zen-buttons.css + +*:not(.no-squircles) { + corner-shape: superellipse(var(--zen-squircle-value)); +} diff --git a/src/zen/glance/zen-glance.css b/src/zen/glance/zen-glance.css index 0c03d05a6..ba3029ab9 100644 --- a/src/zen/glance/zen-glance.css +++ b/src/zen/glance/zen-glance.css @@ -41,11 +41,11 @@ &:hover { background: light-dark(rgb(41, 41, 41), rgb(204, 204, 204)); - scale: 1.05; + scale: 1.02; } &:hover:active { - scale: 0.95; + scale: 0.98; } & label { diff --git a/src/zen/glance/zen-glance.inc.xhtml b/src/zen/glance/zen-glance.inc.xhtml index 96f6e3873..de53f06cf 100644 --- a/src/zen/glance/zen-glance.inc.xhtml +++ b/src/zen/glance/zen-glance.inc.xhtml @@ -4,8 +4,8 @@ - - - + + + diff --git a/src/zen/spaces/ZenGradientGenerator.mjs b/src/zen/spaces/ZenGradientGenerator.mjs index b5b7bd289..5ddf4319c 100644 --- a/src/zen/spaces/ZenGradientGenerator.mjs +++ b/src/zen/spaces/ZenGradientGenerator.mjs @@ -1496,7 +1496,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature { getToolbarColor(isDarkMode = false, accentColor = null) { const opacity = 0.8; - let baseColor = isDarkMode ? [255, 255, 255, opacity] : [0, 0, 0, opacity]; // Default toolbar + let baseColor = isDarkMode ? [225, 225, 225, opacity] : [30, 30, 30, opacity]; // Default toolbar if (accentColor) { return this.blendColors(baseColor.slice(0, 3), accentColor, 75).concat(1); } diff --git a/src/zen/spaces/zen-workspaces.css b/src/zen/spaces/zen-workspaces.css index 0007b69da..996ba01ef 100644 --- a/src/zen/spaces/zen-workspaces.css +++ b/src/zen/spaces/zen-workspaces.css @@ -32,6 +32,7 @@ & toolbarbutton { margin: 0; max-width: 28px; + border-radius: var(--toolbarbutton-border-radius); height: 28px; display: flex; justify-content: center; diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css index c24e2cc71..077688268 100644 --- a/src/zen/tabs/zen-tabs/vertical-tabs.css +++ b/src/zen/tabs/zen-tabs/vertical-tabs.css @@ -235,7 +235,7 @@ } @media (-moz-platform: macos) { - --border-radius-medium: 12px; + --border-radius-medium: 14px; --tab-border-radius: 8px; } @@ -1241,6 +1241,8 @@ background: var(--zen-essential-tab-selected-bg); margin: var(--zen-essential-bg-margin); border-radius: calc(var(--border-radius-medium) - var(--zen-essential-bg-margin)); + /* stylelint-disable-next-line property-no-unknown */ + corner-shape: var(--zen-squircle-value); position: absolute; inset: 0; z-index: 0;