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/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/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 index ebe8c552b..005830180 100644 --- a/src/browser/themes/shared/zen-icons/common/selectable/tada.svg +++ b/src/browser/themes/shared/zen-icons/common/selectable/tada.svg @@ -3,5 +3,5 @@ # 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..a8108f6cc 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) diff --git a/src/zen/common/emojis/ZenEmojiPicker.mjs b/src/zen/common/emojis/ZenEmojiPicker.mjs index 0c7fd3976..f9a0e1843 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", 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 */ 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%; }