Merge branch 'dev' of https://github.com/zen-browser/desktop into dev

mr-cheffy · mr-cheffy · commit 62c55a9de1ee · 2025-09-04T12:24:27.000+02:00
diff --git a/prefs/extensions.yaml b/prefs/extensions.yaml
@@ -4,6 +4,3 @@
 
 - name: xpinstall.signatures.required
   value: true
-
-- name: extensions.pocket.enabled
-  value: false
diff --git 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/tada.svg 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/.
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill="context-fill" fill-opacity="context-fill-opacity" d="m9.874 9.343.056.048 4.988 4.989a.588.588 0 0 1-.145.937l-.068.03-6.106 2.25c-1.147.422-2.264-.656-1.916-1.802l.03-.086 2.25-6.105a.588.588 0 0 1 .85-.303Zm5.309 2.553c.536.028 1.27.141 1.908.525a.588.588 0 0 1-.544 1.04l-.06-.032c-.402-.24-.914-.336-1.366-.359a4 4 0 0 0-.558.002l-.186.02a.588.588 0 0 1-.165-1.165 5 5 0 0 1 .97-.031m1.192-1.638a.588.588 0 0 1 .067 1.172l-.067.003h-.417a.588.588 0 0 1-.068-1.171l.068-.004zm-1.87-.451a.59.59 0 0 1 .047.776l-.048.055-.624.624a.588.588 0 0 1-.88-.776l.049-.056.623-.623a.59.59 0 0 1 .832 0m-1.521-3.096c.263.792.122 1.658-.042 2.264a6 6 0 0 1-.406 1.095.588.588 0 0 1-1.052-.525 4.7 4.7 0 0 0 .323-.879c.133-.49.2-1.02.098-1.455l-.037-.127a.588.588 0 1 1 1.116-.373m3.183 1.434a.59.59 0 0 1 0 .831l-.415.416a.588.588 0 1 1-.832-.831l.415-.416a.59.59 0 0 1 .831 0"/>
+</svg>
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
@@ -238,10 +238,6 @@
   list-style-image: url('privateBrowsing.svg') !important;
 }
 
-#save-to-pocket-button {
-  list-style-image: url('pocket-outline.svg') !important;
-}
-
 #profiler-button-button > .toolbarbutton-icon,
 .subviewbutton[label='Task Manager'] {
   list-style-image: url('tool-profiler.svg') !important;
diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn
@@ -97,7 +97,6 @@
 *  skin/classic/browser/zen-icons/persistent-storage.svg                      (../shared/zen-icons/lin/persistent-storage.svg) 
 *  skin/classic/browser/zen-icons/pin.svg                      (../shared/zen-icons/lin/pin.svg) 
 *  skin/classic/browser/zen-icons/plus.svg                      (../shared/zen-icons/lin/plus.svg) 
-*  skin/classic/browser/zen-icons/pocket-outline.svg                      (../shared/zen-icons/lin/pocket-outline.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/lin/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/lin/print.svg) 
 *  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
@@ -239,7 +238,6 @@
 *  skin/classic/browser/zen-icons/persistent-storage.svg                      (../shared/zen-icons/lin/persistent-storage.svg) 
 *  skin/classic/browser/zen-icons/pin.svg                      (../shared/zen-icons/lin/pin.svg) 
 *  skin/classic/browser/zen-icons/plus.svg                      (../shared/zen-icons/lin/plus.svg) 
-*  skin/classic/browser/zen-icons/pocket-outline.svg                      (../shared/zen-icons/lin/pocket-outline.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/lin/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/lin/print.svg) 
 *  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
@@ -381,7 +379,6 @@
 *  skin/classic/browser/zen-icons/persistent-storage.svg                      (../shared/zen-icons/lin/persistent-storage.svg) 
 *  skin/classic/browser/zen-icons/pin.svg                      (../shared/zen-icons/lin/pin.svg) 
 *  skin/classic/browser/zen-icons/plus.svg                      (../shared/zen-icons/lin/plus.svg) 
-*  skin/classic/browser/zen-icons/pocket-outline.svg                      (../shared/zen-icons/lin/pocket-outline.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/lin/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/lin/print.svg) 
 *  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
@@ -472,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/browser/themes/shared/zen-icons/lin/pocket-outline.svg b/src/browser/themes/shared/zen-icons/lin/pocket-outline.svg
diff --git a/src/browser/themes/shared/zen-icons/win/pocket-outline.svg b/src/browser/themes/shared/zen-icons/win/pocket-outline.svg
diff --git 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 {
diff --git 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 */
