mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-09-03 04:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

no-bug: Polish changes

Browse Source
This commit is contained in:
mr. m
2026-09-02 10:46:11 +02:00
parent 2fd2dbb272
commit 5656eeecfc
23 changed files with 207 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,7 +298,6 @@ jobs:
secrets: inherit
with:
use-sccache: ${{ inputs.use-sccache }}
force-candidate: ${{ !inputs.create_release }}
build-version: ${{ needs.build-data.outputs.version }}
generate-pgo: true
profile-data-path-archive: zen-windows-profile-data-and-jarlog.zip
@@ -314,7 +313,6 @@ jobs:
secrets: inherit
needs: [windows-step-1, build-data]
with:
force-candidate: ${{ !inputs.create_release }}
build-version: ${{ needs.build-data.outputs.version }}
profile-data-path-archive: zen.win64-pgo-stage-1.zip
release-branch: ${{ inputs.update_branch }}
@@ -329,7 +327,6 @@ jobs:
if: ${{ !failure() && !cancelled() }}
needs: [build-data, windows-step-2, start-self-host, buildid]
with:
force-candidate: ${{ !inputs.create_release }}
build-version: ${{ needs.build-data.outputs.version }}
generate-pgo: false
disable-pgo: ${{ inputs.disable-pgo }}
@@ -345,7 +342,6 @@ jobs:
secrets: inherit
needs: [build-data, start-self-host, buildid]
with:
force-candidate: ${{ !inputs.create_release }}
build-version: ${{ needs.build-data.outputs.version }}
release-branch: ${{ inputs.update_branch }}
MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
@@ -362,7 +358,6 @@ jobs:
secrets: inherit
with:
use-sccache: ${{ inputs.use-sccache }}
force-candidate: ${{ !inputs.create_release }}
build-version: ${{ needs.build-data.outputs.version }}
generate-pgo: true
release-branch: ${{ inputs.update_branch }}
@@ -377,7 +372,6 @@ jobs:
secrets: inherit
needs: [mac-step-1, build-data]
with:
force-candidate: ${{ !inputs.create_release }}
build-version: ${{ needs.build-data.outputs.version }}
release-branch: ${{ inputs.update_branch }}
@@ -391,7 +385,6 @@ jobs:
if: ${{ !failure() && !cancelled() }}
needs: [build-data, mac-step-2, start-self-host, buildid]
with:
force-candidate: ${{ !inputs.create_release }}
build-version: ${{ needs.build-data.outputs.version }}
generate-pgo: false
disable-pgo: ${{ inputs.disable-pgo }}
@@ -407,7 +400,6 @@ jobs:
secrets: inherit
needs: [build-data, mac-step-3]
with:
force-candidate: ${{ !inputs.create_release }}
build-version: ${{ needs.build-data.outputs.version }}
release-branch: ${{ inputs.update_branch }}

8
.github/workflows/linux-release-build.yml vendored
View File

@@ -25,14 +25,6 @@ on:
required: false
type: boolean
default: false
force-candidate:
description: "Force building against the Firefox release candidate"
required: false
type: boolean
default: false
env:
SURFER_FORCE_CANDIDATE: ${{ inputs.force-candidate && '1' || '' }}
jobs:
build-linux:

8
.github/workflows/macos-profile-build.yml vendored
View File

@@ -14,14 +14,6 @@ on:
description: "The branch to build"
required: true
type: string
force-candidate:
description: "Force building against the Firefox release candidate"
required: false
type: boolean
default: false
env:
SURFER_FORCE_CANDIDATE: ${{ inputs.force-candidate && '1' || '' }}
jobs:
macos-profile-build:

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

@@ -32,14 +32,6 @@ on:
required: true
type: boolean
default: false
force-candidate:
description: "Force building against the Firefox release candidate"
required: false
type: boolean
default: false
env:
SURFER_FORCE_CANDIDATE: ${{ inputs.force-candidate && '1' || '' }}
jobs:
mac-build:

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

@@ -11,14 +11,6 @@ on:
description: "The branch to build"
required: true
type: string
force-candidate:
description: "Force building against the Firefox release candidate"
required: false
type: boolean
default: false
env:
SURFER_FORCE_CANDIDATE: ${{ inputs.force-candidate && '1' || '' }}
jobs:
mac-build:

8
.github/workflows/windows-profile-build.yml vendored
View File

@@ -18,14 +18,6 @@ on:
description: "The branch to build"
required: true
type: string
force-candidate:
description: "Force building against the Firefox release candidate"
required: false
type: boolean
default: false
env:
SURFER_FORCE_CANDIDATE: ${{ inputs.force-candidate && '1' || '' }}
jobs:
windows-profile-build:

7
.github/workflows/windows-release-build.yml vendored
View File

@@ -35,13 +35,6 @@ on:
required: true
type: boolean
default: false
force-candidate:
description: "Force building against the Firefox release candidate"
required: false
type: boolean
default: false
env:
SURFER_FORCE_CANDIDATE: ${{ inputs.force-candidate && '1' || '' }}
jobs:
windows-build:

4
src/browser/themes/shared/zen-icons/icons.css
View File

@@ -435,10 +435,6 @@
list-style-image: url("arrow-left.svg") !important;
}
#appmenu-moreTools-button {
list-style-image: url("customize.svg") !important;
}
#zen-copy-current-url-button,
#share-tab-button,
#zen-site-data-header-share {

37
src/browser/themes/shared/zen-icons/jar.inc.mn
View File

@@ -14,8 +14,8 @@
* skin/classic/browser/zen-icons/autoplay-media-fill.svg (../shared/zen-icons/nucleo/autoplay-media-fill.svg)
* skin/classic/browser/zen-icons/autoplay-media.svg (../shared/zen-icons/nucleo/autoplay-media.svg)
* skin/classic/browser/zen-icons/back.svg (../shared/zen-icons/nucleo/back.svg)
* skin/classic/browser/zen-icons/blocked-element.svg (../shared/zen-icons/nucleo/blocked-element.svg)
* skin/classic/browser/zen-icons/block.svg (../shared/zen-icons/nucleo/block.svg)
* skin/classic/browser/zen-icons/blocked-element.svg (../shared/zen-icons/nucleo/blocked-element.svg)
* skin/classic/browser/zen-icons/bolt.svg (../shared/zen-icons/nucleo/bolt.svg)
* skin/classic/browser/zen-icons/bookmark-hollow.svg (../shared/zen-icons/nucleo/bookmark-hollow.svg)
* skin/classic/browser/zen-icons/bookmark-star-on-tray.svg (../shared/zen-icons/nucleo/bookmark-star-on-tray.svg)
@@ -104,26 +104,27 @@
* skin/classic/browser/zen-icons/popup-fill.svg (../shared/zen-icons/nucleo/popup-fill.svg)
* skin/classic/browser/zen-icons/popup.svg (../shared/zen-icons/nucleo/popup.svg)
* skin/classic/browser/zen-icons/print.svg (../shared/zen-icons/nucleo/print.svg)
* skin/classic/browser/zen-icons/privateBrowsing.svg (../shared/zen-icons/nucleo/privateBrowsing.svg)
* skin/classic/browser/zen-icons/private-window-small.svg (../shared/zen-icons/nucleo/private-window-small.svg)
* skin/classic/browser/zen-icons/private-window.svg (../shared/zen-icons/nucleo/private-window.svg)
* skin/classic/browser/zen-icons/privateBrowsing.svg (../shared/zen-icons/nucleo/privateBrowsing.svg)
* skin/classic/browser/zen-icons/reader-mode.svg (../shared/zen-icons/nucleo/reader-mode.svg)
* skin/classic/browser/zen-icons/reload.svg (../shared/zen-icons/nucleo/reload.svg)
* skin/classic/browser/zen-icons/save.svg (../shared/zen-icons/nucleo/save.svg)
* skin/classic/browser/zen-icons/screen-blocked.svg (../shared/zen-icons/nucleo/screen-blocked.svg)
* skin/classic/browser/zen-icons/screenshot.svg (../shared/zen-icons/nucleo/screenshot.svg)
* skin/classic/browser/zen-icons/screen.svg (../shared/zen-icons/nucleo/screen.svg)
* skin/classic/browser/zen-icons/screenshot.svg (../shared/zen-icons/nucleo/screenshot.svg)
* skin/classic/browser/zen-icons/search-glass.svg (../shared/zen-icons/nucleo/search-glass.svg)
* skin/classic/browser/zen-icons/search-page.svg (../shared/zen-icons/nucleo/search-page.svg)
* skin/classic/browser/zen-icons/security-broken.svg (../shared/zen-icons/nucleo/security-broken.svg)
* skin/classic/browser/zen-icons/security.svg (../shared/zen-icons/nucleo/security.svg)
* skin/classic/browser/zen-icons/security-warning.svg (../shared/zen-icons/nucleo/security-warning.svg)
* skin/classic/browser/zen-icons/security.svg (../shared/zen-icons/nucleo/security.svg)
* skin/classic/browser/zen-icons/send-to-device.svg (../shared/zen-icons/nucleo/send-to-device.svg)
* skin/classic/browser/zen-icons/settings-fill.svg (../shared/zen-icons/nucleo/settings-fill.svg)
* skin/classic/browser/zen-icons/settings.svg (../shared/zen-icons/nucleo/settings.svg)
* skin/classic/browser/zen-icons/share.svg (../shared/zen-icons/nucleo/share.svg)
* skin/classic/browser/zen-icons/sidebar-right.svg (../shared/zen-icons/nucleo/sidebar-right.svg)
* skin/classic/browser/zen-icons/sidebars-right.svg (../shared/zen-icons/nucleo/sidebars-right.svg)
* skin/classic/browser/zen-icons/sidebar.svg (../shared/zen-icons/nucleo/sidebar.svg)
* skin/classic/browser/zen-icons/sidebars-right.svg (../shared/zen-icons/nucleo/sidebars-right.svg)
* skin/classic/browser/zen-icons/sliders.svg (../shared/zen-icons/nucleo/sliders.svg)
* skin/classic/browser/zen-icons/sparkles.svg (../shared/zen-icons/nucleo/sparkles.svg)
* skin/classic/browser/zen-icons/spell-check.svg (../shared/zen-icons/nucleo/spell-check.svg)
@@ -164,8 +165,8 @@
* skin/classic/browser/zen-icons/autoplay-media-fill.svg (../shared/zen-icons/nucleo/autoplay-media-fill.svg)
* skin/classic/browser/zen-icons/autoplay-media.svg (../shared/zen-icons/nucleo/autoplay-media.svg)
* skin/classic/browser/zen-icons/back.svg (../shared/zen-icons/nucleo/back.svg)
* skin/classic/browser/zen-icons/blocked-element.svg (../shared/zen-icons/nucleo/blocked-element.svg)
* skin/classic/browser/zen-icons/block.svg (../shared/zen-icons/nucleo/block.svg)
* skin/classic/browser/zen-icons/blocked-element.svg (../shared/zen-icons/nucleo/blocked-element.svg)
* skin/classic/browser/zen-icons/bolt.svg (../shared/zen-icons/nucleo/bolt.svg)
* skin/classic/browser/zen-icons/bookmark-hollow.svg (../shared/zen-icons/nucleo/bookmark-hollow.svg)
* skin/classic/browser/zen-icons/bookmark-star-on-tray.svg (../shared/zen-icons/nucleo/bookmark-star-on-tray.svg)
@@ -254,26 +255,27 @@
* skin/classic/browser/zen-icons/popup-fill.svg (../shared/zen-icons/nucleo/popup-fill.svg)
* skin/classic/browser/zen-icons/popup.svg (../shared/zen-icons/nucleo/popup.svg)
* skin/classic/browser/zen-icons/print.svg (../shared/zen-icons/nucleo/print.svg)
* skin/classic/browser/zen-icons/privateBrowsing.svg (../shared/zen-icons/nucleo/privateBrowsing.svg)
* skin/classic/browser/zen-icons/private-window-small.svg (../shared/zen-icons/nucleo/private-window-small.svg)
* skin/classic/browser/zen-icons/private-window.svg (../shared/zen-icons/nucleo/private-window.svg)
* skin/classic/browser/zen-icons/privateBrowsing.svg (../shared/zen-icons/nucleo/privateBrowsing.svg)
* skin/classic/browser/zen-icons/reader-mode.svg (../shared/zen-icons/nucleo/reader-mode.svg)
* skin/classic/browser/zen-icons/reload.svg (../shared/zen-icons/nucleo/reload.svg)
* skin/classic/browser/zen-icons/save.svg (../shared/zen-icons/nucleo/save.svg)
* skin/classic/browser/zen-icons/screen-blocked.svg (../shared/zen-icons/nucleo/screen-blocked.svg)
* skin/classic/browser/zen-icons/screenshot.svg (../shared/zen-icons/nucleo/screenshot.svg)
* skin/classic/browser/zen-icons/screen.svg (../shared/zen-icons/nucleo/screen.svg)
* skin/classic/browser/zen-icons/screenshot.svg (../shared/zen-icons/nucleo/screenshot.svg)
* skin/classic/browser/zen-icons/search-glass.svg (../shared/zen-icons/nucleo/search-glass.svg)
* skin/classic/browser/zen-icons/search-page.svg (../shared/zen-icons/nucleo/search-page.svg)
* skin/classic/browser/zen-icons/security-broken.svg (../shared/zen-icons/nucleo/security-broken.svg)
* skin/classic/browser/zen-icons/security.svg (../shared/zen-icons/nucleo/security.svg)
* skin/classic/browser/zen-icons/security-warning.svg (../shared/zen-icons/nucleo/security-warning.svg)
* skin/classic/browser/zen-icons/security.svg (../shared/zen-icons/nucleo/security.svg)
* skin/classic/browser/zen-icons/send-to-device.svg (../shared/zen-icons/nucleo/send-to-device.svg)
* skin/classic/browser/zen-icons/settings-fill.svg (../shared/zen-icons/nucleo/settings-fill.svg)
* skin/classic/browser/zen-icons/settings.svg (../shared/zen-icons/nucleo/settings.svg)
* skin/classic/browser/zen-icons/share.svg (../shared/zen-icons/nucleo/share.svg)
* skin/classic/browser/zen-icons/sidebar-right.svg (../shared/zen-icons/nucleo/sidebar-right.svg)
* skin/classic/browser/zen-icons/sidebars-right.svg (../shared/zen-icons/nucleo/sidebars-right.svg)
* skin/classic/browser/zen-icons/sidebar.svg (../shared/zen-icons/nucleo/sidebar.svg)
* skin/classic/browser/zen-icons/sidebars-right.svg (../shared/zen-icons/nucleo/sidebars-right.svg)
* skin/classic/browser/zen-icons/sliders.svg (../shared/zen-icons/nucleo/sliders.svg)
* skin/classic/browser/zen-icons/sparkles.svg (../shared/zen-icons/nucleo/sparkles.svg)
* skin/classic/browser/zen-icons/spell-check.svg (../shared/zen-icons/nucleo/spell-check.svg)
@@ -314,8 +316,8 @@
* skin/classic/browser/zen-icons/autoplay-media-fill.svg (../shared/zen-icons/nucleo/autoplay-media-fill.svg)
* skin/classic/browser/zen-icons/autoplay-media.svg (../shared/zen-icons/nucleo/autoplay-media.svg)
* skin/classic/browser/zen-icons/back.svg (../shared/zen-icons/nucleo/back.svg)
* skin/classic/browser/zen-icons/blocked-element.svg (../shared/zen-icons/nucleo/blocked-element.svg)
* skin/classic/browser/zen-icons/block.svg (../shared/zen-icons/nucleo/block.svg)
* skin/classic/browser/zen-icons/blocked-element.svg (../shared/zen-icons/nucleo/blocked-element.svg)
* skin/classic/browser/zen-icons/bolt.svg (../shared/zen-icons/nucleo/bolt.svg)
* skin/classic/browser/zen-icons/bookmark-hollow.svg (../shared/zen-icons/nucleo/bookmark-hollow.svg)
* skin/classic/browser/zen-icons/bookmark-star-on-tray.svg (../shared/zen-icons/nucleo/bookmark-star-on-tray.svg)
@@ -404,26 +406,27 @@
* skin/classic/browser/zen-icons/popup-fill.svg (../shared/zen-icons/nucleo/popup-fill.svg)
* skin/classic/browser/zen-icons/popup.svg (../shared/zen-icons/nucleo/popup.svg)
* skin/classic/browser/zen-icons/print.svg (../shared/zen-icons/nucleo/print.svg)
* skin/classic/browser/zen-icons/privateBrowsing.svg (../shared/zen-icons/nucleo/privateBrowsing.svg)
* skin/classic/browser/zen-icons/private-window-small.svg (../shared/zen-icons/nucleo/private-window-small.svg)
* skin/classic/browser/zen-icons/private-window.svg (../shared/zen-icons/nucleo/private-window.svg)
* skin/classic/browser/zen-icons/privateBrowsing.svg (../shared/zen-icons/nucleo/privateBrowsing.svg)
* skin/classic/browser/zen-icons/reader-mode.svg (../shared/zen-icons/nucleo/reader-mode.svg)
* skin/classic/browser/zen-icons/reload.svg (../shared/zen-icons/nucleo/reload.svg)
* skin/classic/browser/zen-icons/save.svg (../shared/zen-icons/nucleo/save.svg)
* skin/classic/browser/zen-icons/screen-blocked.svg (../shared/zen-icons/nucleo/screen-blocked.svg)
* skin/classic/browser/zen-icons/screenshot.svg (../shared/zen-icons/nucleo/screenshot.svg)
* skin/classic/browser/zen-icons/screen.svg (../shared/zen-icons/nucleo/screen.svg)
* skin/classic/browser/zen-icons/screenshot.svg (../shared/zen-icons/nucleo/screenshot.svg)
* skin/classic/browser/zen-icons/search-glass.svg (../shared/zen-icons/nucleo/search-glass.svg)
* skin/classic/browser/zen-icons/search-page.svg (../shared/zen-icons/nucleo/search-page.svg)
* skin/classic/browser/zen-icons/security-broken.svg (../shared/zen-icons/nucleo/security-broken.svg)
* skin/classic/browser/zen-icons/security.svg (../shared/zen-icons/nucleo/security.svg)
* skin/classic/browser/zen-icons/security-warning.svg (../shared/zen-icons/nucleo/security-warning.svg)
* skin/classic/browser/zen-icons/security.svg (../shared/zen-icons/nucleo/security.svg)
* skin/classic/browser/zen-icons/send-to-device.svg (../shared/zen-icons/nucleo/send-to-device.svg)
* skin/classic/browser/zen-icons/settings-fill.svg (../shared/zen-icons/nucleo/settings-fill.svg)
* skin/classic/browser/zen-icons/settings.svg (../shared/zen-icons/nucleo/settings.svg)
* skin/classic/browser/zen-icons/share.svg (../shared/zen-icons/nucleo/share.svg)
* skin/classic/browser/zen-icons/sidebar-right.svg (../shared/zen-icons/nucleo/sidebar-right.svg)
* skin/classic/browser/zen-icons/sidebars-right.svg (../shared/zen-icons/nucleo/sidebars-right.svg)
* skin/classic/browser/zen-icons/sidebar.svg (../shared/zen-icons/nucleo/sidebar.svg)
* skin/classic/browser/zen-icons/sidebars-right.svg (../shared/zen-icons/nucleo/sidebars-right.svg)
* skin/classic/browser/zen-icons/sliders.svg (../shared/zen-icons/nucleo/sliders.svg)
* skin/classic/browser/zen-icons/sparkles.svg (../shared/zen-icons/nucleo/sparkles.svg)
* skin/classic/browser/zen-icons/spell-check.svg (../shared/zen-icons/nucleo/spell-check.svg)
@@ -459,8 +462,8 @@
* skin/classic/browser/zen-icons/selectable/basket.svg (../shared/zen-icons/common/selectable/basket.svg)
* skin/classic/browser/zen-icons/selectable/bed.svg (../shared/zen-icons/common/selectable/bed.svg)
* skin/classic/browser/zen-icons/selectable/bell.svg (../shared/zen-icons/common/selectable/bell.svg)
* skin/classic/browser/zen-icons/selectable/bookmark.svg (../shared/zen-icons/common/selectable/bookmark.svg)
* skin/classic/browser/zen-icons/selectable/book.svg (../shared/zen-icons/common/selectable/book.svg)
* skin/classic/browser/zen-icons/selectable/bookmark.svg (../shared/zen-icons/common/selectable/bookmark.svg)
* skin/classic/browser/zen-icons/selectable/briefcase.svg (../shared/zen-icons/common/selectable/briefcase.svg)
* skin/classic/browser/zen-icons/selectable/brush.svg (../shared/zen-icons/common/selectable/brush.svg)
* skin/classic/browser/zen-icons/selectable/bug.svg (../shared/zen-icons/common/selectable/bug.svg)
@@ -522,8 +525,8 @@
* skin/classic/browser/zen-icons/selectable/shapes.svg (../shared/zen-icons/common/selectable/shapes.svg)
* skin/classic/browser/zen-icons/selectable/shirt.svg (../shared/zen-icons/common/selectable/shirt.svg)
* skin/classic/browser/zen-icons/selectable/skull.svg (../shared/zen-icons/common/selectable/skull.svg)
* skin/classic/browser/zen-icons/selectable/squares.svg (../shared/zen-icons/common/selectable/squares.svg)
* skin/classic/browser/zen-icons/selectable/square.svg (../shared/zen-icons/common/selectable/square.svg)
* skin/classic/browser/zen-icons/selectable/squares.svg (../shared/zen-icons/common/selectable/squares.svg)
* skin/classic/browser/zen-icons/selectable/star-1.svg (../shared/zen-icons/common/selectable/star-1.svg)
* skin/classic/browser/zen-icons/selectable/star.svg (../shared/zen-icons/common/selectable/star.svg)
* skin/classic/browser/zen-icons/selectable/stats-chart.svg (../shared/zen-icons/common/selectable/stats-chart.svg)

5
src/browser/themes/shared/zen-icons/nucleo/private-window-small.svg Normal file
View File

@@ -0,0 +1,5 @@
#filter dumbComments emptyLines substitution
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 -1 20 20"><path d="M12.75 10.5a3.25 3.25 0 1 1-3.19 2.632 1.25 1.25 0 0 0-1.119 0q.059.3.059.618a3.25 3.25 0 1 1-3.25-3.25 3.24 3.24 0 0 1 2.571 1.268 2.74 2.74 0 0 1 2.357 0A3.24 3.24 0 0 1 12.75 10.5M5.25 12a1.75 1.75 0 1 0 0 3.5 1.75 1.75 0 0 0 0-3.5m7.5 0a1.75 1.75 0 1 0 0 3.5 1.75 1.75 0 0 0 0-3.5m-.867-11c.87 0 1.61.64 1.732 1.503l.34 2.393L16.78 7.72A.75.75 0 0 1 16.25 9H1.75a.751.751 0 0 1-.53-1.28l2.823-2.824.342-2.393A1.75 1.75 0 0 1 6.117 1zM3.56 7.5h10.88L12.94 6H5.06zm2.557-5a.25.25 0 0 0-.237.17l-.011.045L5.614 4.5h6.772l-.255-1.785a.25.25 0 0 0-.248-.215z"/></svg>

4
src/external-patches/firefox/bug_2011236.patch
View File

@@ -150,8 +150,8 @@ diff --git a/docshell/shistory/SessionHistoryEntry.cpp b/docshell/shistory/Sessi
aLoadState->TypeHint())) {
MOZ_DIAGNOSTIC_ASSERT(!mURI->SchemeIs("javascript"));
// Verify the documented purpose of mBaseURI.
@@ -130,11 +139,12 @@
// Pull the upload stream off of the channel instead of the load state, as
@@ -124,11 +133,12 @@
loadInfo->GetPrincipalToInherit(
getter_AddRefs(mSharedState.Get()->mPrincipalToInherit));

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

@@ -295,7 +295,7 @@
&,
.urlbar-background {
border-radius: calc(12px * var(--zen-squircle-value)) !important;
border-radius: 12px !important;
}
&[breakout-extend][animate-searchmode="true"]::before {
@@ -639,7 +639,7 @@
#urlbar-label-box,
#urlbar-search-mode-indicator {
--urlbar-basic-component-size: 18px;
--urlbar-basic-component-size: auto;
background-color: color-mix(in srgb, var(--zen-primary-color) 50%, light-dark(rgba(0, 0, 0, 0.5), rgba(255, 255, 255, 0.2)) 50%) !important;
color: white;
padding: 4px 8px;

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

@@ -1476,14 +1476,19 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
* @returns {string} The primary color in hex format.
*/
getAccentColorForUI(accentColor, isDarkMode) {
const [h, s, l] = this.rgbToHsl(...accentColor);
let [r, g, b] = accentColor;
if (isDarkMode) {
return `rgb(${accentColor[0]}, ${accentColor[1]}, ${accentColor[2]})`;
return `rgb(${r}, ${g}, ${b})`;
}
// gh-15142: Special case for grayscale colors
if (r == g && g == b) {
return `rgb(${r}, ${g}, ${b})`;
}
const [h, s, l] = this.rgbToHsl(...accentColor);
const saturation = Math.min(1, s + 0.3);
const targetLightness = this.isDarkMode ? 0.62 : 0.42;
const lightness = l * 0.4 + targetLightness * 0.6;
const [r, g, b] = this.hslToRgb(h / 360, saturation, lightness);
[r, g, b] = this.hslToRgb(h / 360, saturation, lightness);
return `rgb(${r}, ${g}, ${b})`;
}
@@ -1504,7 +1509,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
baseColor = this.blendColors(
accentColor,
baseColor.slice(0, 3),
this.canBeTransparent ? 15 : 5
this.canBeTransparent ? 25 : 5
).concat(opacity);
}
return baseColor;

2
src/zen/spaces/ZenSpaceManager.mjs
View File

@@ -2550,7 +2550,7 @@ class nsZenWorkspaces {
"Default";
name = this.isPrivateWindow ? "Incognito" : label;
if (this.isPrivateWindow) {
icon = gZenEmojiPicker.getSVGURL("eye.svg");
icon = "chrome://browser/skin/zen-icons/private-window-small.svg";
}
}
let workspace = {

4
src/zen/tests/mochitests/sessionstore/browser.toml
View File

@@ -16,6 +16,8 @@ support-files = [
"browser_frame_history_c2.html",
"browser_formdata_format_sample.html",
"browser_sessionHistory_slow.sjs",
"browser_policy_container_sample.html",
"browser_policy_container_sample_frame.html",
"browser_scrollPositions_sample.html",
"browser_scrollPositions_sample2.html",
"browser_scrollPositions_sample_frameset.html",
@@ -247,6 +249,8 @@ skip-if = [
"ccov", # Bug 1625525
]
["browser_policy_container_not_stored.js"]
["browser_privatetabs.js"]
["browser_purge_domaindata.js"]

51
src/zen/tests/mochitests/sessionstore/browser_policy_container_not_stored.js Normal file
View File

@@ -0,0 +1,51 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
/**
* A session history entry only needs to retain the policy container for loads
* that inherit their policies (about:blank, about:srcdoc, blob:, data:, ...).
* Anything fetched over the network gets its policies from the response again,
* so storing them would only bloat the session store (bug 2011236).
*/
const TEST_ROOT = getRootDirectory(gTestPath).replace(
"chrome://mochitests/content",
"https://example.com"
);
const PARENT_URL = TEST_ROOT + "browser_policy_container_sample.html";
const FRAME_URL = TEST_ROOT + "browser_policy_container_sample_frame.html";
add_task(async function test_policy_container_only_for_inheriting_loads() {
const tab = BrowserTestUtils.addTab(gBrowser, PARENT_URL);
gBrowser.selectedTab = tab;
await promiseBrowserLoaded(tab.linkedBrowser, true, PARENT_URL);
await TabStateFlusher.flush(tab.linkedBrowser);
const state = JSON.parse(ss.getTabState(tab));
const topEntry = state.entries.at(-1);
is(topEntry.url, PARENT_URL, "collected the parent entry");
const children = topEntry.children ?? [];
const networkFrame = children.find(child => child.url === FRAME_URL);
const blankFrame = children.find(child => child.url === "about:blank");
ok(networkFrame, "collected the network-scheme subframe entry");
ok(blankFrame, "collected the about:blank subframe entry");
// The parent has a CSP, so both subframes inherit a policy container onto
// their load state. Only the one that cannot recover it from a response
// should keep it in session history.
ok(
!("policyContainer" in networkFrame),
"https subframe entry does not store a policyContainer"
);
ok(
"policyContainer" in blankFrame,
"about:blank subframe entry still stores its inherited policyContainer"
);
await BrowserTestUtils.removeTab(tab);
});

12
src/zen/tests/mochitests/sessionstore/browser_policy_container_sample.html Normal file
View File

@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Security-Policy" content="default-src * data: blob: 'unsafe-inline'">
<title>policyContainer session store sample</title>
</head>
<body>
<iframe id="network" src="browser_policy_container_sample_frame.html"></iframe>
<iframe id="blank" src="about:blank"></iframe>
</body>
</html>

10
src/zen/tests/mochitests/sessionstore/browser_policy_container_sample_frame.html Normal file
View File

@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>policyContainer session store sample frame</title>
</head>
<body>
frame
</body>
</html>

73
src/zen/tests/mochitests/sessionstore/unit/test_write_json_length_hint.js Normal file
View File

@@ -0,0 +1,73 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const { SessionWriter } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/SessionWriter.sys.mjs"
);
const profd = do_get_profile();
const { SessionFile } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/SessionFile.sys.mjs"
);
const { updateAppInfo } = ChromeUtils.importESModule(
"resource://testing-common/AppInfo.sys.mjs"
);
updateAppInfo({
name: "SessionRestoreTest",
ID: "{230de50e-4cd1-11dc-8314-0800200c9a66}",
version: "1",
platformVersion: "",
});
add_setup(async function () {
let source = do_get_file("data/sessionstore_valid.js");
source.copyTo(profd, "sessionstore.js");
await writeCompressedFile(
SessionFile.Paths.clean.replace("jsonlz4", "js"),
SessionFile.Paths.clean
);
await SessionFile.read();
});
add_task(async function test_length_hint_updates_after_write() {
Assert.equal(
SessionWriter._jsonLengthHint,
0,
"Length hint starts at 0"
);
await SessionFile.write({});
let hintAfterSmall = SessionWriter._jsonLengthHint;
Assert.equal(
hintAfterSmall,
JSON.stringify({}).length,
"Hint matches the uncompressed JSON byte length"
);
let largerState = await IOUtils.readJSON(
PathUtils.join(do_get_cwd().path, "data", "sessionstore_complete.json")
);
await SessionFile.write(largerState);
Assert.greater(
SessionWriter._jsonLengthHint,
hintAfterSmall,
"Hint grows after writing a larger state"
);
});
add_task(async function test_length_hint_resets_on_wipe() {
await SessionFile.write({ windows: [{ tabs: [{ entries: [] }] }] });
Assert.greater(SessionWriter._jsonLengthHint, 0, "Hint is nonzero");
await SessionFile.wipe();
Assert.equal(
SessionWriter._jsonLengthHint,
0,
"Hint resets to 0 after wipe"
);
});

5
src/zen/tests/mochitests/sessionstore/unit/xpcshell.toml
View File

@@ -41,3 +41,8 @@ skip-if = [
]
["test_startup_session_async.js"]
["test_write_json_length_hint.js"]
support-files = [
"data/sessionstore_complete.json",
]

4
src/zen/tests/mochitests/tabMediaIndicator/browser.toml
View File

@@ -35,12 +35,12 @@ https_first_disabled = true
["browser_mute.js"]
["browser_mute2.js"]
["browser_mute_persist_navigation.js"]
["browser_mute_restore_closed_audible_tab.js"]
["browser_mute2.js"]
["browser_mute_webAudio.js"]
["browser_sound_indicator_silent_video.js"]

12
src/zen/welcome/ZenWelcome.mjs
View File

@@ -189,7 +189,7 @@
document.getElementById("zen-welcome-start").remove();
const pages = document.getElementById("zen-welcome-pages");
pages.style.display = "flex";
animate(pages, { opacity: [0, 1] }, { ...kFade, duration: 0.2 });
animate(pages, { opacity: [0, 1] }, { ...kFade, duration: 0.45 });
this.backButton.addEventListener("click", () => this.back());
}
@@ -501,7 +501,7 @@
// 20 is the shadow width * 2
anchor.style.height =
panelRect.height -
(AppConstants.platform == "macosx" ? -72 : 20) +
(AppConstants.platform == "macosx" ? -90 : 20) +
"px";
anchor.style.width = panelRect.width - 20 + "px";
},
@@ -687,7 +687,7 @@
chars,
{ opacity: [0, 1], y: [50, 0] },
{
delay: getMotion().stagger(0.035, { startDelay: 0.2 }),
delay: getMotion().stagger(0.035, { startDelay: 0.8 }),
type: "spring",
bounce: 0.3,
visualDuration: 0.45,
@@ -700,7 +700,11 @@
await animate(
"#zen-welcome-title .zen-welcome-char, #zen-welcome-start-button",
{ opacity: [1, 0], y: [0, -14] },
{ ...kSpring, delay: getMotion().stagger(0.012) }
{
duration: 0.3,
ease: "easeIn",
delay: getMotion().stagger(0.012),
}
);
new nsZenWelcomePages(getWelcomePages());
},

5
src/zen/welcome/zen-welcome.css
View File

@@ -74,7 +74,7 @@
font-weight: 600;
cursor: pointer;
will-change: transform;
transition: scale 0.25s cubic-bezier(0.34, 1.56, 0.64, 1);
transition: scale 0.15s ease-out;
&:hover {
scale: 1.03;
@@ -110,7 +110,7 @@
fill: white !important;
will-change: transform;
transition: scale 0.25s cubic-bezier(0.34, 1.56, 0.64, 1);
transition: scale 0.15s ease-out;
&:hover {
scale: 1.03;
@@ -294,6 +294,7 @@
overflow-y: auto;
padding-top: 6rem;
padding-bottom: 6rem;
scrollbar-width: none;
mask-image: linear-gradient(
transparent,