eliott/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop synced 2026-04-25 17:15:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

no-bug: Start making use of blacksmith macos runners for release (gh-13350)

Browse Source
This commit is contained in:
mr. m
2026-04-21 22:28:15 +02:00
committed by GitHub
parent c2d45162e0
commit 3b8e6f4718
10 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/macos-release-build.yml vendored
View File

@@ -26,7 +26,7 @@ on:
jobs:
mac-build:
name: Build macOS - ${{ matrix.arch }}
runs-on: macos-26
runs-on: ${{ (inputs.release-branch == 'release' && matrix.arch == 'aarch64') && 'blacksmith-6vcpu-macos-latest' || 'macos-26' }}
strategy:
fail-fast: false

11
configs/macos/mozconfig
View File

@@ -7,13 +7,6 @@ unset MOZ_STDCXX_COMPAT
ac_add_options --disable-dmd
ac_add_options --enable-eme=widevine
if test "$ZEN_RELEASE"; then
# override LTO settings
# TODO: Dont use LTO for now, it's causing a lot of issues
export MOZ_LTO=cross,thin
ac_add_options --enable-lto=cross,thin
fi
if test "$ZEN_RELEASE"; then
if ! test "$ZEN_GA_DISABLE_PGO"; then
if test "$ZEN_GA_GENERATE_PROFILE"; then
@@ -32,6 +25,10 @@ if test "$SURFER_COMPAT" = "x86_64"; then
if test "$ZEN_RELEASE"; then
ac_add_options --enable-wasm-avx
# override LTO settings
export MOZ_LTO=cross,thin
ac_add_options --enable-lto=cross,thin
fi
else
ac_add_options --target=aarch64-apple-darwin

8
package-lock.json generated
View File

@@ -11,7 +11,7 @@
"devDependencies": {
"@babel/preset-typescript": "^7.27.0",
"@zen-browser/prettier": "^3.9.3",
"@zen-browser/surfer": "^1.14.4",
"@zen-browser/surfer": "^1.14.5",
"formal-git": "^1.2.9",
"globals": "^16.3.0",
"husky": "^9.1.7",
@@ -868,9 +868,9 @@
}
},
"node_modules/@zen-browser/surfer": {
"version": "1.14.4",
"resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.14.4.tgz",
"integrity": "sha512-9PA3Z/wJL/wCbjAuy51N1LsOgd/5dIyZOJ+Sn81S6mm/3g5yZhrWMxcwugH2p6ULp/G4wu+3sCmd39Jrj0ccWg==",
"version": "1.14.5",
"resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.14.5.tgz",
"integrity": "sha512-VLvYuM1y86Hqux5GDcPwU7FIx2ADbpumnNyO3NI5mK3DtUB8jULPXbhzEtB8qnnRLiQ86yxyPf9ONT28/7FZCg==",
"dev": true,
"license": "MPL-2.0",
"dependencies": {

2
package.json
View File

@@ -47,7 +47,7 @@
"devDependencies": {
"@babel/preset-typescript": "^7.27.0",
"@zen-browser/prettier": "^3.9.3",
"@zen-browser/surfer": "^1.14.4",
"@zen-browser/surfer": "^1.14.5",
"formal-git": "^1.2.9",
"globals": "^16.3.0",
"husky": "^9.1.7",

1
src/zen/common/styles/zen-omnibox.css
View File

@@ -584,6 +584,7 @@
position: relative;
scale: 0.93;
transform-origin: right;
opacity: 0.7;
&::after {
content: "";

18
src/zen/common/styles/zen-theme.css
View File

@@ -70,18 +70,18 @@
--in-content-primary-button-background: color-mix(
in srgb,
var(--zen-primary-color) 30%,
var(--zen-branding-bg-reverse) 70%
var(--zen-primary-color) 40%,
var(--zen-branding-bg-reverse)
) !important;
--in-content-primary-button-background-hover: color-mix(
in srgb,
var(--zen-primary-color) 35%,
var(--zen-branding-bg-reverse) 65%
var(--zen-primary-color) 45%,
var(--zen-branding-bg-reverse)
) !important;
--in-content-primary-button-background-active: color-mix(
in srgb,
var(--zen-primary-color) 40%,
var(--zen-branding-bg-reverse) 60%
var(--zen-primary-color) 50%,
var(--zen-branding-bg-reverse)
) !important;
--in-content-primary-button-text-color: var(--zen-branding-bg) !important;
--in-content-primary-button-border-color: transparent !important;
@@ -250,7 +250,7 @@
--panel-separator-color: color-mix(in srgb, currentColor 15%, transparent) !important;
--zen-big-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
--zen-active-tab-scale: 0.98;
--zen-active-tab-scale: 0.99;
/* Define tab hover background color */
--tab-hover-background-color: var(--toolbarbutton-hover-background);
@@ -258,11 +258,13 @@
/* Sidebar Notifications */
--zen-sidebar-notification-bg: color-mix(
in srgb,
var(--zen-primary-color) 15%,
var(--zen-primary-color) 5%,
light-dark(white, black)
);
--zen-sidebar-notification-shadow: 0 0 6px light-dark(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.3));
--zen-sidebar-themed-icon-fill: color-mix(in srgb, var(--zen-primary-color) 40%, light-dark(black, white));
--zen-native-inner-radius: var(
--zen-webview-border-radius,
/* Inner radius calculation:

2
src/zen/folders/zen-folders.css
View File

@@ -177,7 +177,7 @@ zen-folder {
& > label {
width: 100% !important;
border: none !important;
color: var(--sidebar-text-color) !important;
color: var(--toolbar-color) !important;
margin: 0 !important;
font-weight: 600;
align-self: center !important;

26
src/zen/spaces/ZenGradientGenerator.mjs
View File

@@ -1493,9 +1493,13 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
return color;
}
getToolbarColor(isDarkMode = false) {
getToolbarColor(isDarkMode = false, accentColor = null) {
const opacity = 0.8;
return isDarkMode ? [255, 255, 255, opacity] : [0, 0, 0, opacity]; // Default toolbar
let baseColor = isDarkMode ? [255, 255, 255, opacity] : [0, 0, 0, opacity]; // Default toolbar
if (accentColor) {
return this.blendColors(baseColor.slice(0, 3), accentColor, 75).concat(1);
}
return baseColor;
}
get browserBackgroundElement() {
@@ -1756,7 +1760,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
}
}
// Set `--toolbox-textcolor` to have a contrast with the primary color
const textColor = this.getToolbarColor(isDarkMode);
let textColor = this.getToolbarColor(isDarkMode, dominantColor);
docElement.style.setProperty(
"--toolbox-textcolor",
`rgba(${textColor[0]}, ${textColor[1]}, ${textColor[2]}, ${textColor[3]})`
@@ -1765,20 +1769,6 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
"--toolbar-color-scheme",
isDarkMode ? "dark" : "light"
);
// Tint toolbar elements with an accent-hued color toned against the
// current mode — dark mode gets a light tint, light mode a dark tint.
const tintTarget = isDarkMode ? [255, 255, 255] : [0, 0, 0];
const [tr, tg, tb] = this.blendColors(dominantColor, tintTarget, 25);
const elementBgAlpha = isDarkMode ? 0.18 : 0.1;
const elementHoverAlpha = isDarkMode ? 0.28 : 0.16;
docElement.style.setProperty(
"--zen-toolbar-element-bg",
`rgba(${tr}, ${tg}, ${tb}, ${elementBgAlpha})`
);
docElement.style.setProperty(
"--zen-toolbar-element-bg-hover",
`rgba(${tr}, ${tg}, ${tb}, ${elementHoverAlpha})`
);
}
if (!skipUpdate) {
@@ -2007,7 +1997,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
grain: theme.texture ?? 0,
isDarkMode,
isExplicitMode,
toolbarColor: this.getToolbarColor(isDarkMode),
toolbarColor: this.getToolbarColor(isDarkMode, dominantColor),
primaryColor: this.getAccentColorForUI(dominantColor),
};
this.currentOpacity = previousOpacity;

8
src/zen/spaces/zen-workspaces.css
View File

@@ -40,6 +40,8 @@
align-items: center;
position: relative;
fill-opacity: 0.6;
-moz-context-properties: fill-opacity, fill;
fill: currentColor;
& .zen-workspace-icon {
pointer-events: none;
@@ -71,6 +73,10 @@
width 0.1s,
transform 0.2s;
&[active='true'] .zen-workspace-icon {
fill: var(--zen-sidebar-themed-icon-fill);
}
&[active='true'],
&:hover,
&[dragged='true'] {
@@ -212,7 +218,7 @@
align-items: center;
fill-opacity: 0.6;
-moz-context-properties: fill-opacity, fill;
fill: var(--toolbox-textcolor);
fill: var(--zen-sidebar-themed-icon-fill);
font-size: 16px;
padding-top: 2px;
color: light-dark(rgba(0, 0, 0, 0.8), rgba(255, 255, 255, 0.8));

4
src/zen/tabs/zen-tabs/vertical-tabs.css
View File

@@ -341,7 +341,7 @@
:root:not([zen-renaming-tab="true"])
#tabbrowser-tabs:not([movingtab])
& .tab-content > image:active {
scale: 0.98;
scale: 0.97;
}
& .tab-icon-image {
@@ -1089,7 +1089,7 @@
&:active,
&[open] {
scale: 0.98;
scale: 0.99;
}
&[in-urlbar] {