Merge branch 'dev' into media-control

2025-10-16 23:06:30 +00:00 · 2025-03-13 15:00:09 +01:00
parent 3c40758c6a d765c7c655
commit 20ff1dc446
21 changed files with 265 additions and 92 deletions
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -48,6 +48,7 @@

    openWatermark() {
      if (!Services.prefs.getBoolPref('zen.watermark.enabled', false)) {
+        document.documentElement.removeAttribute('zen-before-loaded');
        return;
      }
      for (let elem of document.querySelectorAll('#browser > *, #urlbar')) {
--- a/src/browser/base/content/zen-fonts/JunicodeVF-Italic.woff2
+++ b/src/browser/base/content/zen-fonts/JunicodeVF-Italic.woff2
--- a/src/browser/base/content/zen-fonts/JunicodeVF-Roman.woff2
+++ b/src/browser/base/content/zen-fonts/JunicodeVF-Roman.woff2
--- a/src/browser/base/content/zen-styles/zen-single-components.css
+++ b/src/browser/base/content/zen-styles/zen-single-components.css
@@ -19,12 +19,6 @@
  text-overflow: ellipsis;
 }

-@media not (-moz-bool-pref: 'zen.watermark.enabled') {
-  #zen-watermark {
-    display: none;
-  }
-}
-
 #customization-footer #customization-toolbar-visibility-button {
  display: none !important;
 }