From 264496925fd56f766af829fc8de26ad15ba35b47 Mon Sep 17 00:00:00 2001 From: mauro-balades Date: Mon, 9 Sep 2024 20:38:08 +0200 Subject: [PATCH 01/11] Refactor GitHub Actions workflow to upload dist folder to GitHub --- .github/workflows/windows-alpha-build.yml | 35 ++++++----------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml index ab95cd4fb..30c22110d 100644 --- a/.github/workflows/windows-alpha-build.yml +++ b/.github/workflows/windows-alpha-build.yml @@ -211,30 +211,11 @@ jobs: name: ${{ matrix.generic == true && 'generic' || 'specific' }}-${{ inputs.profile-data-path-archive }} path: ./zen.win64-pgo-stage-1.zip - - name: Upload mar - uses: actions/upload-artifact@v4 - if: ${{ !inputs.generate-gpo }} - with: - name: windows${{ matrix.generic == true && '-generic' || '' }}.mar - path: ./windows${{ matrix.generic == true && '-generic' || '' }}.mar - - - name: Upload installer - uses: actions/upload-artifact@v4 - if: ${{ !inputs.generate-gpo }} - with: - name: zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe - path: ./zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe - - - name: Upload installer stub - uses: actions/upload-artifact@v4 - if: ${{ !inputs.generate-gpo && false }} - with: - name: zen.installer.pretty.exe - path: ./dist/zen.installer.pretty.exe - - - name: Upload update manifests - uses: actions/upload-artifact@v4 - if: ${{ !inputs.generate-gpo }} - with: - name: windows_update_manifest_${{ matrix.generic == true && 'generic' || 'specific' }} - path: ./dist/update + - name: Upload dist folder to github + run: | + set -x + git pull + tar -czf .github/objects/windows-x64.tar.gz engine/obj-x86_64-pc-windows-msvc + git add .github/objects/windows-x64.tar.gz + git commit -m "Add windows-x64.tar.gz" + git push From 06638a06f741578496d12c86d87396b3e23bfa75 Mon Sep 17 00:00:00 2001 From: mauro-balades Date: Mon, 9 Sep 2024 20:44:37 +0200 Subject: [PATCH 02/11] Refactor GitHub Actions workflow to unpack windows build artifacts --- .github/workflows/alpha.yml | 13 +++++++++---- .github/workflows/windows-alpha-build.yml | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 274737f04..390716ce6 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -326,6 +326,11 @@ jobs: - name: List run: find . + - name: Unpack windows build + run: | + tar -xvf .github/workflows/object/windows-x64-signed-generic.tar.gz -C windows-x64-signed-generic + tar -xvf .github/workflows/object/windows-x64-signed-specific.tar.gz -C windows-x64-signed-specific + - name: Clone updates repo uses: actions/checkout@v4 with: @@ -340,8 +345,8 @@ jobs: cp -a ../linux_update_manifest_generic/. updates/ cp -a ../linux_update_manifest_specific/. updates/ - cp -a ../windows_update_manifest_generic/. updates/ - cp -a ../windows_update_manifest_specific/. updates/ + cp -a ../windows-x64-signed-generic/update_manifest/. updates/ + cp -a ../windows-x64-signed-specific/update_manifest/. updates/ cp -a ../macos_update_manifest_aarch64/. updates/ cp -a ../macos_update_manifest_x64/. updates/ @@ -372,8 +377,8 @@ jobs: zen.win-specific.zip linux.mar linux-generic.mar - windows.mar - windows-generic.mar + windows-x64-signed-generic/windows-generic.mar + windows-x64-signed-specific/windows.mar macos-x64.mar macos-aarch64.mar zen.installer.exe diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml index 30c22110d..0845035e8 100644 --- a/.github/workflows/windows-alpha-build.yml +++ b/.github/workflows/windows-alpha-build.yml @@ -215,7 +215,7 @@ jobs: run: | set -x git pull - tar -czf .github/objects/windows-x64.tar.gz engine/obj-x86_64-pc-windows-msvc + tar -czf .github/objects/windows-x64-obj-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.gz .tar.gz engine/obj-x86_64-pc-windows-msvc git add .github/objects/windows-x64.tar.gz git commit -m "Add windows-x64.tar.gz" git push From c08c235be3b665a07c47ffee7dc3e0d8bf46fcd9 Mon Sep 17 00:00:00 2001 From: mauro-balades Date: Mon, 9 Sep 2024 20:47:17 +0200 Subject: [PATCH 03/11] Refactor GitHub Actions workflow to remove unnecessary build steps --- .github/workflows/alpha.yml | 25 +------------------------ configs/windows/mozconfig | 11 ----------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 390716ce6..0cdc07263 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -183,36 +183,13 @@ jobs: name: zen.source.tar.gz path: ./zen.source.tar.gz - windows-step-1: - name: Windows build step 1 (PGO build) - uses: ./.github/workflows/windows-alpha-build.yml - needs: [build-data] - permissions: - contents: write - secrets: inherit - with: - build-version: ${{ needs.build-data.outputs.version }} - generate-gpo: true - profile-data-path-archive: zen-windows-x86_64-profile-data-and-jarlog.zip - - windows-step-2: - name: Windows build step 2 (Generate profile data) - uses: ./.github/workflows/windows-profile-build.yml - permissions: - contents: write - secrets: inherit - needs: [windows-step-1, build-data] - with: - build-version: ${{ needs.build-data.outputs.version }} - profile-data-path-archive: zen.win64-pgo-stage-1.zip - windows-step-3: name: Windows build step 3 (build with profile data) uses: ./.github/workflows/windows-alpha-build.yml permissions: contents: write secrets: inherit - needs: [build-data, windows-step-2] + needs: [build-data] with: build-version: ${{ needs.build-data.outputs.version }} generate-gpo: false diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig index 3101401b0..54a1fb638 100644 --- a/configs/windows/mozconfig +++ b/configs/windows/mozconfig @@ -52,15 +52,4 @@ fi export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine" export VERBOSE=1 -if test "$ZEN_CROSS_COMPILING"; then - if test "$ZEN_GA_GENERATE_PROFILE"; then - export CXXFLAGS="$CXXFLAGS -fprofile-generate -mllvm -enable-name-compression=false -mllvm -pgo-temporal-instrumentation -fprofile-update=atomic" - mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0" - ac_add_options --enable-profile-generate=cross - else - ac_add_options --enable-profile-use=cross - ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata - ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US.log - fi -fi From 14ff60b6ad6b9cc767e68ffb3ec09813ccf5fbe0 Mon Sep 17 00:00:00 2001 From: mauro-balades Date: Mon, 9 Sep 2024 20:55:47 +0200 Subject: [PATCH 04/11] Refactor GitHub Actions workflow to add Windows build steps and profile data generation --- .github/workflows/alpha.yml | 25 ++++++++++++++++++++++++- configs/windows/mozconfig | 11 +++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 0cdc07263..390716ce6 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -183,13 +183,36 @@ jobs: name: zen.source.tar.gz path: ./zen.source.tar.gz + windows-step-1: + name: Windows build step 1 (PGO build) + uses: ./.github/workflows/windows-alpha-build.yml + needs: [build-data] + permissions: + contents: write + secrets: inherit + with: + build-version: ${{ needs.build-data.outputs.version }} + generate-gpo: true + profile-data-path-archive: zen-windows-x86_64-profile-data-and-jarlog.zip + + windows-step-2: + name: Windows build step 2 (Generate profile data) + uses: ./.github/workflows/windows-profile-build.yml + permissions: + contents: write + secrets: inherit + needs: [windows-step-1, build-data] + with: + build-version: ${{ needs.build-data.outputs.version }} + profile-data-path-archive: zen.win64-pgo-stage-1.zip + windows-step-3: name: Windows build step 3 (build with profile data) uses: ./.github/workflows/windows-alpha-build.yml permissions: contents: write secrets: inherit - needs: [build-data] + needs: [build-data, windows-step-2] with: build-version: ${{ needs.build-data.outputs.version }} generate-gpo: false diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig index 54a1fb638..3101401b0 100644 --- a/configs/windows/mozconfig +++ b/configs/windows/mozconfig @@ -52,4 +52,15 @@ fi export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine" export VERBOSE=1 +if test "$ZEN_CROSS_COMPILING"; then + if test "$ZEN_GA_GENERATE_PROFILE"; then + export CXXFLAGS="$CXXFLAGS -fprofile-generate -mllvm -enable-name-compression=false -mllvm -pgo-temporal-instrumentation -fprofile-update=atomic" + mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0" + ac_add_options --enable-profile-generate=cross + else + ac_add_options --enable-profile-use=cross + ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata + ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US.log + fi +fi From 83f71e446efe6c860f916f560bd4400f691b1c93 Mon Sep 17 00:00:00 2001 From: mauro-balades Date: Mon, 9 Sep 2024 23:08:29 +0200 Subject: [PATCH 05/11] updated submodules --- l10n | 2 +- src/browser/base/content/zen-components | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n b/l10n index f44e23e33..530f0c018 160000 --- a/l10n +++ b/l10n @@ -1 +1 @@ -Subproject commit f44e23e33cc19675b7c6f5ecb276c84a4dae5d32 +Subproject commit 530f0c018cb6ca3044cc067720ce1133dac55e4b diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components index 26173f7cf..6ab00d24f 160000 --- a/src/browser/base/content/zen-components +++ b/src/browser/base/content/zen-components @@ -1 +1 @@ -Subproject commit 26173f7cfb17926fcbf4ad54918c2955704ce7a9 +Subproject commit 6ab00d24f8587d19acfc1c3f1660f42fe190eea7 From 9e251af4a778285d36a0262da1c7faf3092c60d3 Mon Sep 17 00:00:00 2001 From: mauro-balades Date: Tue, 10 Sep 2024 19:08:42 +0200 Subject: [PATCH 06/11] Refactor mozconfig to disable data reporting, services health report, and telemetry reporting --- configs/common/mozconfig | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configs/common/mozconfig b/configs/common/mozconfig index ac0c9ad15..267fd6b2d 100644 --- a/configs/common/mozconfig +++ b/configs/common/mozconfig @@ -90,12 +90,11 @@ ac_add_options --enable-jxl ac_add_options --enable-av1 ac_add_options --enable-eme=widevine -ac_add_options --allow-addon-sideload ac_add_options --with-unsigned-addon-scopes=app,system -mk_add_options MOZ_DATA_REPORTING=0 -mk_add_options MOZ_SERVICES_HEALTHREPORT=0 -mk_add_options MOZ_TELEMETRY_REPORTING=0 +mk_add_options MOZ_DATA_REPORTING= +mk_add_options MOZ_SERVICES_HEALTHREPORT= +mk_add_options MOZ_TELEMETRY_REPORTING= # Allow loading unsigned extensions export MOZ_REQUIRE_SIGNING= From da36c5e37510ad10426595470007e8981bd06e78 Mon Sep 17 00:00:00 2001 From: mauro-balades Date: Tue, 10 Sep 2024 19:19:36 +0200 Subject: [PATCH 07/11] Refactor zen-browser-ui.css to add styling for the Notification Stack --- .../content/zen-styles/zen-browser-ui.css | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css index 12835336d..4eec93b59 100644 --- a/src/browser/base/content/zen-styles/zen-browser-ui.css +++ b/src/browser/base/content/zen-styles/zen-browser-ui.css @@ -37,3 +37,26 @@ display: flex; flex-direction: row; } + +/* Notification Stack */ + +.notificationbox-stack { + + &[notificationside="top"] { + position: absolute; + bottom: 0; + right: 0; + width: fit-content; + max-width: 30rem !important; + + & notification-message { + background: var(--zen-colors-tertiary); + border-left: 1px solid var(--arrowpanel-border-color); + border-top-left-radius: var(--zen-border-radius); + + &::before { + display: none; + } + } + } +} \ No newline at end of file From 0e57c961c86e4d289b8855a400f04deeacd28b58 Mon Sep 17 00:00:00 2001 From: mauro-balades Date: Tue, 10 Sep 2024 20:44:01 +0200 Subject: [PATCH 08/11] Refactor l10n submodule commit reference --- .github/workflows/windows-alpha-build.yml | 1 + l10n | 2 +- .../content/zen-styles/zen-browser-ui.css | 23 ------- .../base/content/zen-styles/zen-theme.css | 30 +++++++++ .../base/content/zen-styles/zen-urlbar.css | 41 +++++++++--- .../preferences/main-inc-xhtml.patch | 11 +++- .../components/preferences/zen-settings.js | 57 ++++++++++++++++ .../preferences/zenLooksAndFeel.inc.xhtml | 66 ++++++++++++++----- .../shared/preferences/zen-preferences.css | 14 +++- 9 files changed, 192 insertions(+), 53 deletions(-) diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml index 0845035e8..db0e5969e 100644 --- a/.github/workflows/windows-alpha-build.yml +++ b/.github/workflows/windows-alpha-build.yml @@ -212,6 +212,7 @@ jobs: path: ./zen.win64-pgo-stage-1.zip - name: Upload dist folder to github + if: ${{ !inputs.generate-gpo }} run: | set -x git pull diff --git a/l10n b/l10n index 530f0c018..0e976aef3 160000 --- a/l10n +++ b/l10n @@ -1 +1 @@ -Subproject commit 530f0c018cb6ca3044cc067720ce1133dac55e4b +Subproject commit 0e976aef37a43262a464495d473ceaff5038cab4 diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css index 4eec93b59..5a98d9605 100644 --- a/src/browser/base/content/zen-styles/zen-browser-ui.css +++ b/src/browser/base/content/zen-styles/zen-browser-ui.css @@ -36,27 +36,4 @@ #tabbrowser-tabbox { display: flex; flex-direction: row; -} - -/* Notification Stack */ - -.notificationbox-stack { - - &[notificationside="top"] { - position: absolute; - bottom: 0; - right: 0; - width: fit-content; - max-width: 30rem !important; - - & notification-message { - background: var(--zen-colors-tertiary); - border-left: 1px solid var(--arrowpanel-border-color); - border-top-left-radius: var(--zen-border-radius); - - &::before { - display: none; - } - } - } } \ No newline at end of file diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css index fbe3f4451..8f5adb2ca 100644 --- a/src/browser/base/content/zen-styles/zen-theme.css +++ b/src/browser/base/content/zen-styles/zen-theme.css @@ -132,6 +132,36 @@ } } +@media (prefers-color-scheme: dark) { + @media (-moz-bool-pref: 'zen.theme.color-prefs.amoled') { + :root { + --zen-dark-color-mix-base: lch(2.467% 0 272 / 1); + --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 4%, rgb(0, 0, 0) 96%); + } + } + + @media (-moz-bool-pref: 'zen.theme.color-prefs.colorful') { + :root { + --zen-in-content-dialog-background: rgb(28, 28, 32); + + --zen-colors-primary: color-mix(in srgb, var(--zen-primary-color) 50%, black 50%); + --zen-colors-secondary: color-mix(in srgb, var(--zen-primary-color) 40%, black 60%); + --zen-colors-tertiary: color-mix(in srgb, var(--zen-primary-color) 15%, black 85%); + + --zen-colors-hover-bg: color-mix(in srgb, var(--zen-primary-color) 90%, black 10%); + --zen-colors-primary-foreground: color-mix(in srgb, var(--zen-primary-color) 80%, white 20%); + + --zen-colors-input-bg: color-mix(in srgb, var(--zen-primary-color) 10%, black 80%); + --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 80%, black 20%); + + --zen-dialog-background: color-mix(in srgb, var(--zen-primary-color) 10%, black 90%); + --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 8%, rgb(15, 15, 15) 92%); + + --zen-browser-gradient-base: color-mix(in srgb, var(--zen-primary-color) 30%, black 70%); + } + } +} + @media not (-moz-bool-pref: 'zen.theme.toolbar-themed') { :root { --toolbar-bgcolor: light-dark(white, #1b1b1b) !important; diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css index df4cf3ba1..3fd892b2c 100644 --- a/src/browser/base/content/zen-styles/zen-urlbar.css +++ b/src/browser/base/content/zen-styles/zen-urlbar.css @@ -1,12 +1,12 @@ /* URL and tool bars */ #urlbar { - --toolbarbutton-border-radius: 6px; + --toolbarbutton-border-radius: 10px; --urlbarView-separator-color: var(--zen-colors-border); --urlbarView-hover-background: var(--toolbarbutton-hover-background); --urlbarView-highlight-background: var(--toolbarbutton-hover-background); border: 1px solid var(--zen-colors-border); - border-radius: 999px; + border-radius: var(--toolbarbutton-border-radius); overflow: hidden; padding: 1px; } @@ -38,10 +38,13 @@ outline-color: none !important; } -#urlbar .urlbar-page-action, #urlbar #tracking-protection-icon-container, #urlbar:not([breakout-extend='true']) #identity-box:is(:not(.chromeUI), [pageproxystate='invalid']) #identity-icon-box { - border-radius: 999px; + border-radius: var(--toolbarbutton-border-radius); +} + +#urlbar .urlbar-page-action { + border-radius: calc(var(--toolbarbutton-border-radius) / 1.5); } #urlbar[breakout-extend='true'] .urlbar-page-action, @@ -57,7 +60,7 @@ #identity-icon-box, #identity-permission-box { - background: var(--zen-colors-secondary) !important; + background: color-mix(in srgb, var(--zen-colors-secondary) 40%, transparent 60%) !important; margin: 0 8px 0 0 !important; } @@ -78,10 +81,6 @@ margin-right: 0 !important; } -#urlbar:not([breakout-extend='true']) #identity-box.chromeUI:not([pageproxystate='invalid']) #identity-icon-box { - border-radius: 20px 10px 10px 20px !important; -} - #urlbar:not([extend='true']) #identity-box #identity-icon-box { position: relative; } @@ -222,3 +221,27 @@ button.popup-notification-dropmarker { } } } + + +/* Notification Stack */ + +.notificationbox-stack { + + &[notificationside="top"] { + position: absolute; + bottom: 0; + right: 0; + width: fit-content; + max-width: 30rem !important; + + & notification-message { + background: var(--zen-colors-tertiary); + border-left: 1px solid var(--arrowpanel-border-color); + border-top-left-radius: var(--zen-border-radius); + + &::before { + display: none; + } + } + } +} diff --git a/src/browser/components/preferences/main-inc-xhtml.patch b/src/browser/components/preferences/main-inc-xhtml.patch index 92cfd70d0..a95812404 100644 --- a/src/browser/components/preferences/main-inc-xhtml.patch +++ b/src/browser/components/preferences/main-inc-xhtml.patch @@ -1,7 +1,16 @@ diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml -index 4c2637db10b7ad5d253d9588be3610c1ec5ad330..b8445b808cf9dcb54d380ae78172db4bf8250cd4 100644 +index 4c2637db10b7ad5d253d9588be3610c1ec5ad330..b7861f7888b0d3f9abd5249f8356e6b9b5c3005f 100644 --- a/browser/components/preferences/main.inc.xhtml +++ b/browser/components/preferences/main.inc.xhtml +@@ -163,7 +163,7 @@ + + + +- Date: Tue, 10 Sep 2024 20:45:38 +0200 Subject: [PATCH 09/11] Refactor zen-browser-ui.css to add padding to tabbrowser-tabpanels --- src/browser/base/content/zen-styles/zen-browser-ui.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css index 5a98d9605..c49c7120d 100644 --- a/src/browser/base/content/zen-styles/zen-browser-ui.css +++ b/src/browser/base/content/zen-styles/zen-browser-ui.css @@ -10,7 +10,7 @@ --inactive-titlebar-opacity: 1; } -#tabbrowser-tabpanels { +:root:not([inDOMFullscreen='true']) #tabbrowser-tabpanels { padding-right: var(--zen-element-separation); padding-bottom: var(--zen-element-separation); } From 3565b775572f7b202ccd7138432cbbd61d332724 Mon Sep 17 00:00:00 2001 From: mauro-balades Date: Tue, 10 Sep 2024 20:55:24 +0200 Subject: [PATCH 10/11] Refactor zen-urlbar.css to update styling for the URL bar and identity boxes --- src/browser/base/content/zen-styles/zen-urlbar.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css index 3fd892b2c..6a40a1927 100644 --- a/src/browser/base/content/zen-styles/zen-urlbar.css +++ b/src/browser/base/content/zen-styles/zen-urlbar.css @@ -38,8 +38,7 @@ outline-color: none !important; } -#urlbar #tracking-protection-icon-container, -#urlbar:not([breakout-extend='true']) #identity-box:is(:not(.chromeUI), [pageproxystate='invalid']) #identity-icon-box { +#urlbar #tracking-protection-icon-container { border-radius: var(--toolbarbutton-border-radius); } @@ -60,7 +59,7 @@ #identity-icon-box, #identity-permission-box { - background: color-mix(in srgb, var(--zen-colors-secondary) 40%, transparent 60%) !important; + background: color-mix(in srgb, var(--zen-colors-secondary) 50%, transparent 50%) !important; margin: 0 8px 0 0 !important; } From 490a6822d4ec0409915da7ad0f64b1dab995d8af Mon Sep 17 00:00:00 2001 From: mauro-balades Date: Tue, 10 Sep 2024 21:12:36 +0200 Subject: [PATCH 11/11] Refactor zen-urlbar.css to update styling for the URL bar and identity boxes --- .github/workflows/windows-alpha-build.yml | 6 +++-- .../base/content/zen-styles/zen-urlbar.css | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml index db0e5969e..42910f2ad 100644 --- a/.github/workflows/windows-alpha-build.yml +++ b/.github/workflows/windows-alpha-build.yml @@ -216,7 +216,9 @@ jobs: run: | set -x git pull + mkdir -p .github/objects + rm -rf .github/objects/windows-x64-obj-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.gz || true tar -czf .github/objects/windows-x64-obj-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.gz .tar.gz engine/obj-x86_64-pc-windows-msvc - git add .github/objects/windows-x64.tar.gz - git commit -m "Add windows-x64.tar.gz" + git add .github/objects/windows-x64-obj-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.gz + git commit -m "Add windows-x64-obj-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.gz" git push diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css index 6a40a1927..7f473c9c1 100644 --- a/src/browser/base/content/zen-styles/zen-urlbar.css +++ b/src/browser/base/content/zen-styles/zen-urlbar.css @@ -221,6 +221,32 @@ button.popup-notification-dropmarker { } } +/* Thanks to https://github.com/JLBlk! + * Checkout https://github.com/JLBlk/Zen-Themes/blob/main/SuperUrlBar/SuperUrlBar.css + */ + +#notification-popup-box { + border-radius: 6px !important; +} + +/* Border radius on hover */ +#urlbar .urlbar-page-action, #urlbar #tracking-protection-icon-container, #urlbar:not([breakout-extend="true"]) #identity-box:is(:not(.chromeUI), [pageproxystate="invalid"]) #identity-icon-box { + border-radius: 6px !important;; +} + +/* Border radius of boxes on the left */ +#identity-box:has(#identity-permission-box:is([hasPermissions], [hasSharingIcon])):not([pageproxystate="invalid"]) #identity-icon-box { + border-top-left-radius: 6px !important; + border-bottom-left-radius: 6px !important; + border-top-right-radius: 0 !important; + border-bottom-right-radius: 0 !important; +} + +/* Extensions or similar */ +#urlbar:not([breakout-extend="true"]) #identity-box.chromeUI:not([pageproxystate="invalid"]) #identity-icon-box { + border-radius: 6px 6px 6px 6px !important; +} + /* Notification Stack */