mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-09-05 19:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into improved-color-picker

Browse Source
This commit is contained in:
mr. m
2025-02-16 12:48:53 +01:00
committed by GitHub
parent 2140029a4a c322051ddd
commit 9d9d2d7d50
6 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
.github/workflows/build.yml vendored
View File

@@ -482,6 +482,7 @@ jobs:
token: ${{ secrets.DEPLOY_KEY }}
- name: Download object files
if: ${{ inputs.update_branch == 'release' }}
run: |
git clone https://github.com/zen-browser/windows-binaries.git .github/workflows/object
@@ -518,23 +519,23 @@ jobs:
uses: softprops/action-gh-release@v2
with:
files: |
./zen.source.tar.zst
./zen.linux-x86_64.tar.xz
./zen.linux-aarch64.tar.xz
./zen-x86_64.AppImage
./zen-x86_64.AppImage.zsync
./zen-aarch64.AppImage
./zen-aarch64.AppImage.zsync
./zen.win-x86_64.zip
./zen.win-arm64.zip
./linux.mar
./linux-aarch64.mar
./windows.mar
./windows-arm64.mar
./macos.mar
./zen.installer.exe
./zen.installer-arm64.exe
./zen.macos-universal.dmg
./zen.source.tar.zst/*
./zen.linux-x86_64.tar.xz/*
./zen.linux-aarch64.tar.xz/*
./zen-x86_64.AppImage/*
./zen-x86_64.AppImage.zsync/*
./zen-aarch64.AppImage/*
./zen-aarch64.AppImage.zsync/*
./zen.win-x86_64.zip/*
./zen.win-arm64.zip/*
./linux.mar/*
./linux-aarch64.mar/*
./windows.mar/*
./windows-arm64.mar/*
./macos.mar/*
./zen.installer.exe/*
./zen.installer-arm64.exe/*
./zen.macos-universal.dmg/*
tag_name: 'twilight'
name: 'Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }} at ${{ needs.build-data.outputs.build_time }})'
draft: false
@@ -556,23 +557,23 @@ jobs:
generate_release_notes: false
name: 'Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
files: |
./zen.source.tar.zst
./zen.linux-x86_64.tar.xz
./zen.linux-aarch64.tar.xz
./zen-x86_64.AppImage
./zen-x86_64.AppImage.zsync
./zen-aarch64.AppImage
./zen-aarch64.AppImage.zsync
./zen.source.tar.zst/*
./zen.linux-x86_64.tar.xz/*
./zen.linux-aarch64.tar.xz/*
./zen-x86_64.AppImage/*
./zen-x86_64.AppImage.zsync/*
./zen-aarch64.AppImage/*
./zen-aarch64.AppImage.zsync/*
./.github/workflows/object/windows-x64-signed-x86_64/zen.win-x86_64.zip
./.github/workflows/object/windows-x64-signed-arm64/zen.win-arm64.zip
./linux.mar
./linux-aarch64.mar
./linux.mar/*
./linux-aarch64.mar/*
./.github/workflows/object/windows-x64-signed-x86_64/windows.mar
./.github/workflows/object/windows-x64-signed-arm64/windows-arm64.mar
./macos.mar
./macos.mar/*
./.github/workflows/object/windows-x64-signed-x86_64/zen.installer.exe
./.github/workflows/object/windows-x64-signed-arm64/zen.installer-arm64.exe
./zen.macos-universal.dmg
./zen.macos-universal.dmg/*
prepare-flatpak:
if: ${{ inputs.create_release && inputs.update_branch == 'release' }}

1
configs/common/mozconfig
View File

@@ -9,7 +9,6 @@ ac_add_options --with-l10n-base="${topsrcdir}/browser/locales"
export MOZ_USER_DIR="${name}"
export MOZ_APP_BASENAME=Zen
export MOZ_APP_PROFILE=${binName}
export MOZ_APP_DISPLAYNAME="Zen"
export MOZ_BRANDING_DIRECTORY=${brandingDir}
export MOZ_OFFICIAL_BRANDING_DIRECTORY=${brandingDir}

14
package-lock.json generated
View File

@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "ISC",
"dependencies": {
"@zen-browser/surfer": "^1.9.16"
"@zen-browser/surfer": "^1.9.17"
},
"devDependencies": {
"husky": "^9.1.7",
@@ -270,9 +270,9 @@
"integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
},
"node_modules/@zen-browser/surfer": {
"version": "1.9.16",
"resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.16.tgz",
"integrity": "sha512-6/Vcp1Ox9mt53hoBUuxFvpnRMnlvjFb3GBOcRhpqoYW/yi9mlV3G48icE717wGCoR2TThfuS6SYVfiT/G1kkrw==",
"version": "1.9.17",
"resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.17.tgz",
"integrity": "sha512-Z39jGD8Vf9LqmcFwg0/blvbDVZX7kpXkCSVM1ABDy8yqyJm0emGdwrhZhKrxe0hZgxAEY13cVf1baSyZOVGS+g==",
"license": "MPL-2.0",
"dependencies": {
"@resvg/resvg-js": "^1.4.0",
@@ -2811,9 +2811,9 @@
"integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
},
"@zen-browser/surfer": {
"version": "1.9.16",
"resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.16.tgz",
"integrity": "sha512-6/Vcp1Ox9mt53hoBUuxFvpnRMnlvjFb3GBOcRhpqoYW/yi9mlV3G48icE717wGCoR2TThfuS6SYVfiT/G1kkrw==",
"version": "1.9.17",
"resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.17.tgz",
"integrity": "sha512-Z39jGD8Vf9LqmcFwg0/blvbDVZX7kpXkCSVM1ABDy8yqyJm0emGdwrhZhKrxe0hZgxAEY13cVf1baSyZOVGS+g==",
"requires": {
"@resvg/resvg-js": "^1.4.0",
"async-icns": "^1.0.2",

2
package.json
View File

@@ -41,7 +41,7 @@
},
"homepage": "https://github.com/zen-browser/core#readme",
"dependencies": {
"@zen-browser/surfer": "^1.9.16"
"@zen-browser/surfer": "^1.9.17"
},
"devDependencies": {
"husky": "^9.1.7",

4
src/browser/base/content/zen-styles/zen-browser-ui.css
View File

@@ -172,9 +172,9 @@
.titlebar-buttonbox-container {
/* Draw 3 dots as background to represent the window controls,
all with the same cololr as the titlebar */
background-image: radial-gradient(circle, #4d4c4a 6px, transparent 0.5px);
background-image: radial-gradient(circle, var(--zen-toolbar-element-bg) 6px, transparent 0.5px);
background-size: 20px 22px;
background-position: 52% 50%;
background-position: 53% 50%;
&:not([zen-has-hover='true']) > .titlebar-buttonbox {
opacity: 0;

18
src/browser/base/zen-components/ZenCompactMode.mjs
View File

@@ -342,17 +342,13 @@ var gZenCompactModeManager = {
const buttonRect = gZenVerticalTabsManager.actualWindowButtons.getBoundingClientRect();
const MAC_WINDOW_BUTTONS_X_BORDER = buttonRect.width + buttonRect.x;
const MAC_WINDOW_BUTTONS_Y_BORDER = buttonRect.height + buttonRect.y;
if (event.clientX < MAC_WINDOW_BUTTONS_X_BORDER && event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER) {
// Also check if it has gone from the top or left if we are exiting the titlebar
// button area
if (
!(
target.classList.contains('titlebar-buttonbox-container') &&
(event.clientX < buttonRect.x || event.clientY < buttonRect.y)
)
) {
return;
}
if (
event.clientX < MAC_WINDOW_BUTTONS_X_BORDER &&
event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER &&
event.clientX > buttonRect.x &&
event.clientY > buttonRect.y
) {
return;
}
}