From cdbd68254f816d8fc865b36565bf46ff9a096cb6 Mon Sep 17 00:00:00 2001 From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com> Date: Thu, 4 Sep 2025 01:24:21 +0200 Subject: [PATCH 1/4] Revert "feat: add tada & at icons for ZenEmojiPicker (#10233)" (#10235) This reverts commit eb94927370bb44e4a1c8c4dea2c65359b50f566c. --- .../themes/shared/zen-icons/common/selectable/at.svg | 8 -------- .../themes/shared/zen-icons/common/selectable/tada.svg | 7 ------- src/browser/themes/shared/zen-icons/jar.inc.mn | 2 -- src/zen/common/emojis/ZenEmojiPicker.mjs | 5 ++--- 4 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 src/browser/themes/shared/zen-icons/common/selectable/at.svg delete mode 100644 src/browser/themes/shared/zen-icons/common/selectable/tada.svg diff --git a/src/browser/themes/shared/zen-icons/common/selectable/at.svg b/src/browser/themes/shared/zen-icons/common/selectable/at.svg deleted file mode 100644 index 60b40396b..000000000 --- a/src/browser/themes/shared/zen-icons/common/selectable/at.svg +++ /dev/null @@ -1,8 +0,0 @@ -#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/. - - - - diff --git a/src/browser/themes/shared/zen-icons/common/selectable/tada.svg b/src/browser/themes/shared/zen-icons/common/selectable/tada.svg deleted file mode 100644 index ebe8c552b..000000000 --- a/src/browser/themes/shared/zen-icons/common/selectable/tada.svg +++ /dev/null @@ -1,7 +0,0 @@ -#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/. - - - diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn index fe631ab1e..d4236ee7a 100644 --- a/src/browser/themes/shared/zen-icons/jar.inc.mn +++ b/src/browser/themes/shared/zen-icons/jar.inc.mn @@ -427,7 +427,6 @@ #endif * skin/classic/browser/zen-icons/urlbar-arrow.svg (../shared/zen-icons/common/urlbar-arrow.svg) * skin/classic/browser/zen-icons/selectable/airplane.svg (../shared/zen-icons/common/selectable/airplane.svg) -* skin/classic/browser/zen-icons/selectable/at.svg (../shared/zen-icons/common/selectable/at.svg) * skin/classic/browser/zen-icons/selectable/baseball.svg (../shared/zen-icons/common/selectable/baseball.svg) * 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) @@ -470,7 +469,6 @@ * 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/sun.svg (../shared/zen-icons/common/selectable/sun.svg) -* skin/classic/browser/zen-icons/selectable/tada.svg (../shared/zen-icons/common/selectable/tada.svg) * skin/classic/browser/zen-icons/selectable/terminal.svg (../shared/zen-icons/common/selectable/terminal.svg) * skin/classic/browser/zen-icons/selectable/triangle.svg (../shared/zen-icons/common/selectable/triangle.svg) * skin/classic/browser/zen-icons/selectable/video.svg (../shared/zen-icons/common/selectable/video.svg) diff --git a/src/zen/common/emojis/ZenEmojiPicker.mjs b/src/zen/common/emojis/ZenEmojiPicker.mjs index 0c7fd3976..c15c0e444 100644 --- a/src/zen/common/emojis/ZenEmojiPicker.mjs +++ b/src/zen/common/emojis/ZenEmojiPicker.mjs @@ -4,7 +4,7 @@ { // prettier-ignore const SVG_ICONS = [ - "airplane.svg", "at.svg", "baseball.svg", "basket.svg", "bed.svg", + "airplane.svg", "baseball.svg", "basket.svg", "bed.svg", "bell.svg", "book.svg", "bookmark.svg", "chat.svg", "checkbox.svg", "circle.svg", "cloud.svg", "code.svg", "coins.svg", "cutlery.svg", "egg.svg", "flag.svg", "folder.svg", "globe.svg", @@ -12,8 +12,7 @@ "layers.svg", "lightning.svg", "mail.svg", "map.svg", "moon.svg", "music.svg", "page.svg", "palette.svg", "paw.svg", "people.svg", "pizza.svg", "planet.svg", "present.svg", "shapes.svg", "skull.svg", "square.svg", "squares.svg", "star.svg", - "star-1.svg", "sun.svg", "tada.svg", "terminal.svg", "triangle.svg", "video.svg", - "weight.svg", + "star-1.svg", "sun.svg", "terminal.svg", "triangle.svg", "video.svg", "weight.svg", ]; class nsZenEmojiPicker extends nsZenDOMOperatedFeature { From e533f722ffb7a70e6211bcc5783448bd11e2321c Mon Sep 17 00:00:00 2001 From: "Mr. M" Date: Thu, 4 Sep 2025 12:16:08 +0200 Subject: [PATCH 2/4] fix: Fixed flathub missing attributes, b=no-bug, c=workflows, flatpak, folders, workspaces --- .github/workflows/build.yml | 4 +-- .../flatpak/app.zen_browser.zen.yml.template | 26 +++++++++++++++---- src/zen/folders/ZenFolders.mjs | 1 + src/zen/workspaces/zen-workspaces.css | 10 +++---- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34ee19664..7904eb083 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -734,8 +734,8 @@ jobs: GIT_CURL_VERBOSE: 1 with: token: ${{ secrets.DEPLOY_KEY }} - commit-message: 🚀 Update to version ${{ needs.build-data.outputs.version }} - title: 🚀 Update to version ${{ needs.build-data.outputs.version }} + commit-message: Update to version `${{ needs.build-data.outputs.version }}` + title: Update to version `${{ needs.build-data.outputs.version }}` body: | This PR updates the Zen Browser Flatpak package to version ${{ needs.build-data.outputs.version }}. diff --git a/build/flatpak/app.zen_browser.zen.yml.template b/build/flatpak/app.zen_browser.zen.yml.template index a7724879d..b40d6e5de 100644 --- a/build/flatpak/app.zen_browser.zen.yml.template +++ b/build/flatpak/app.zen_browser.zen.yml.template @@ -11,6 +11,7 @@ add-extensions: add-ld-path: . command: launch-script.sh finish-args: + - --allow=devel - --share=ipc - --share=network - --socket=pulseaudio @@ -19,16 +20,31 @@ finish-args: - --socket=pcsc - --socket=cups - --persist=.zen + - --env=DICPATH=/usr/share/hunspell + - --filesystem=xdg-data/applications:create + - --filesystem=xdg-data/icons:create - --filesystem=xdg-download:rw + - --filesystem=/run/.heim_org.h5l.kcm-socket + - --filesystem=xdg-run/speech-dispatcher:ro - --device=all - --talk-name=org.freedesktop.FileManager1 - - --talk-name=org.freedesktop.ScreenSaver - - --own-name=org.mozilla.zen.* - - --own-name=org.mpris.MediaPlayer2.firefox.* - --system-talk-name=org.freedesktop.NetworkManager - --talk-name=org.a11y.Bus - - --env=GTK_PATH=/app/lib/gtkmodules - - --env=MESA_SHADER_CACHE_DIR=/var/cache/mesa_shader_cache_db + - --talk-name=org.gtk.vfs.* + - --own-name=org.mpris.MediaPlayer2.firefox.* + - --own-name=org.mozilla.zen.* +cleanup: + - /include + - /lib/pkgconfig + - /share/pkgconfig + - /share/aclocal + - /share/gtk-doc + - /share/doc + - /share/info + - /man + - /share/man + - '*.la' + - '*.a' modules: - name: zen_browser buildsystem: simple diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs index 9d95eb760..16cf15aa1 100644 --- a/src/zen/folders/ZenFolders.mjs +++ b/src/zen/folders/ZenFolders.mjs @@ -906,6 +906,7 @@ } handleTabUnpin(tab) { + tab.style.removeProperty('--zen-folder-indent'); const group = tab.group; if (!group) { return false; diff --git a/src/zen/workspaces/zen-workspaces.css b/src/zen/workspaces/zen-workspaces.css index 737c385e1..1b79c5035 100644 --- a/src/zen/workspaces/zen-workspaces.css +++ b/src/zen/workspaces/zen-workspaces.css @@ -318,13 +318,13 @@ zen-workspace { } } } + + &[active] .zen-workspace-empty-space { + -moz-window-dragging: drag; + } } -.zen-workspace-empty-space { - -moz-window-dragging: drag; -} - -/** Customiable UI, this is an auto generated ID */ +/** Customizable UI, this is an auto generated ID */ #wrapper-zen-workspaces-button { width: 100%; } From cc3f0de843ccd86a5f92019c4abf3b620360a7f5 Mon Sep 17 00:00:00 2001 From: reizumi Date: Thu, 4 Sep 2025 18:23:19 +0800 Subject: [PATCH 3/4] fix: always show HTTP warning symbol in single toolbar, p=#10241 --- .../themes/shared/identity-block/identity-block-css.patch | 2 +- src/zen/common/styles/zen-urlbar.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/browser/themes/shared/identity-block/identity-block-css.patch b/src/browser/themes/shared/identity-block/identity-block-css.patch index 1726ef6ee..ff1a3e939 100644 --- a/src/browser/themes/shared/identity-block/identity-block-css.patch +++ b/src/browser/themes/shared/identity-block/identity-block-css.patch @@ -7,7 +7,7 @@ index 13b1659ed5a3b9bb0342b601998d0fd5c9760e22..4f13c401f23f51962986fe8caf197aa5 #identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button, #urlbar-label-box { - background-color: var(--urlbar-box-bgcolor); -+ background-color: light-dark(#cecece, rgb(66, 65, 77)); ++ background-color: transparent; color: var(--urlbar-box-text-color); padding-inline: 8px; border-radius: var(--urlbar-icon-border-radius); diff --git a/src/zen/common/styles/zen-urlbar.css b/src/zen/common/styles/zen-urlbar.css index e6d28f692..e7e63a18a 100644 --- a/src/zen/common/styles/zen-urlbar.css +++ b/src/zen/common/styles/zen-urlbar.css @@ -201,7 +201,7 @@ display: none; } - #identity-box:not([pageproxystate='invalid']) #identity-icon-box:not([open]) { + #identity-box:not([pageproxystate='invalid']):not(.notSecure) #identity-icon-box:not([open]) { margin-inline-start: calc(-8px - 2 * var(--urlbar-icon-padding)); transform: translateX(100%); opacity: 0; @@ -376,7 +376,7 @@ button.popup-notification-dropmarker { #identity-box:is(:not(.chromeUI), [pageproxystate='invalid']) #identity-icon-box { border-radius: var(--urlbar-icon-border-radius) !important; - min-width: 30px; + min-width: 28px; } /* Notification Stack */ From 07c90bc9b8d40c5800ee70ed80ceb61a174f90fa Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Thu, 4 Sep 2025 03:24:16 -0700 Subject: [PATCH 4/4] feat: add tada & at icons for ZenEmojiPicker, p=#10237 --- .../themes/shared/zen-icons/common/selectable/tada.svg | 7 +++++++ src/browser/themes/shared/zen-icons/jar.inc.mn | 1 + src/zen/common/emojis/ZenEmojiPicker.mjs | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/browser/themes/shared/zen-icons/common/selectable/tada.svg diff --git a/src/browser/themes/shared/zen-icons/common/selectable/tada.svg b/src/browser/themes/shared/zen-icons/common/selectable/tada.svg new file mode 100644 index 000000000..005830180 --- /dev/null +++ b/src/browser/themes/shared/zen-icons/common/selectable/tada.svg @@ -0,0 +1,7 @@ +#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/. + + + diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn index d4236ee7a..a8108f6cc 100644 --- a/src/browser/themes/shared/zen-icons/jar.inc.mn +++ b/src/browser/themes/shared/zen-icons/jar.inc.mn @@ -469,6 +469,7 @@ * 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/sun.svg (../shared/zen-icons/common/selectable/sun.svg) +* skin/classic/browser/zen-icons/selectable/tada.svg (../shared/zen-icons/common/selectable/tada.svg) * skin/classic/browser/zen-icons/selectable/terminal.svg (../shared/zen-icons/common/selectable/terminal.svg) * skin/classic/browser/zen-icons/selectable/triangle.svg (../shared/zen-icons/common/selectable/triangle.svg) * skin/classic/browser/zen-icons/selectable/video.svg (../shared/zen-icons/common/selectable/video.svg) diff --git a/src/zen/common/emojis/ZenEmojiPicker.mjs b/src/zen/common/emojis/ZenEmojiPicker.mjs index c15c0e444..f9a0e1843 100644 --- a/src/zen/common/emojis/ZenEmojiPicker.mjs +++ b/src/zen/common/emojis/ZenEmojiPicker.mjs @@ -12,7 +12,8 @@ "layers.svg", "lightning.svg", "mail.svg", "map.svg", "moon.svg", "music.svg", "page.svg", "palette.svg", "paw.svg", "people.svg", "pizza.svg", "planet.svg", "present.svg", "shapes.svg", "skull.svg", "square.svg", "squares.svg", "star.svg", - "star-1.svg", "sun.svg", "terminal.svg", "triangle.svg", "video.svg", "weight.svg", + "star-1.svg", "sun.svg", "tada.svg", "terminal.svg", "triangle.svg", "video.svg", + "weight.svg", ]; class nsZenEmojiPicker extends nsZenDOMOperatedFeature {