Merge branch 'zen-browser:dev' into adds-search-to-icons

.github/workflows/issue-metrics.yml

@@ -45,7 +45,7 @@ jobs:
         GH_TOKEN: ${{ secrets.DEPLOY_KEY }}
         HIDE_AUTHOR: true
         HIDE_TIME_TO_ANSWER: true
-        SEARCH_QUERY: 'repo:zen-browser/desktop is:issue created:${{ env.last_month }} -reason:"not planned"'
+        SEARCH_QUERY: 'repo:zen-browser/desktop is:issue created:${{ env.last_month }}'
 
     - name: Move metrics to docs folder
       run: |

README.md

@@ -44,13 +44,12 @@ We keep track of how many issues are closed at the end of the month in [docs/iss
 
 ### Versioning
 
-Zen uses [Semantic Versioning](https://semver.org/) for versioning. Meaning, versions are displayed as `a.b.c-d.e` where:
+Zen uses [Semantic Versioning](https://semver.org/) for versioning. Meaning, versions are displayed as `a.b-c.d` where:
 
 - `a` is the major version
 - `b` is the minor version
-- `c` is the patch version
-- `d` is the branch prefix
-- `e` is the build number
+- `c` is the branch prefix
+- `d` is the patch version
 
 ### Branches
 
@@ -133,15 +132,9 @@ Zen couldn't be in its current state without the help of these amazing projects!
 
 ### 🖥️ Comparison with other browsers
 
-As you can see, chromium based browsers are the most popular browsers, help us change that by starring the project and spreading the word! 🌟
+Thanks everyone for making zen stand out amongs these giants!
 
-<a href="https://star-history.com/#zen-browser/desktop&Date">
- <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=zen-browser/desktop,chromium/chromium,brave/brave-browser&type=Date&theme=dark" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=zen-browser/desktop,chromium/chromium,brave/brave-browser&type=Date" />
-   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=chromium/chromium,zen-browser/desktop,brave/brave-browser&type=Date" />
- </picture>
-</a>
+[![Star History Chart](https://api.star-history.com/svg?repos=zen-browser/desktop,chromium/chromium,brave/brave-browser&type=Date)](https://star-history.com/#zen-browser/desktop&chromium/chromium&brave/brave-browser&Date)
 
 ## 📄 License
 

configs/common/mozconfig

@@ -98,7 +98,3 @@ mk_add_options MOZ_TELEMETRY_REPORTING=
 # Allow loading unsigned extensions
 export MOZ_REQUIRE_SIGNING=
 mk_add_options MOZ_REQUIRE_SIGNING=
-
-# Sorry ptr, I didnt mean to!
-# Edit: ok, ill remove it, goodbye top #1 on fastest browsers benchmark :[
-# ac_add_options --without-wasm-sandboxed-libraries

src/browser/app/profile/zen-browser.js

@@ -90,6 +90,13 @@ pref('zen.tabs.show-newtab-vertical', true);
 pref('zen.view.show-newtab-button-border-top', true);
 pref('zen.view.show-newtab-button-top', false);
 
+#ifdef MOZILLA_OFFICIAL
+pref('zen.rice.api.url', "https://share.zen-browser.app");
+#else
+pref('zen.rice.api.url', "http://localhost:3000");
+#endif
+pref('zen.rice.share.notice.accepted', false);
+
 #ifdef XP_MACOSX
 pref('zen.theme.border-radius', 10); // In pixels
 #else
@@ -159,7 +166,7 @@ pref('zen.pinned-tab-manager.close-shortcut-behavior', 'switch');
 // Pref to enable the new profiles (TODO: Check this out!)
 //pref("browser.profiles.enabled", true);
 
-// Zen Sidebar
+// Zen webpanels (calling it sidebar due to legacy reasons)
 pref('zen.sidebar.data', "{\"data\":\n {\"p1\":{\n   \"url\":\"https://www.wikipedia.org/\"\n  },\n\"p2\":{\n   \"url\":\"https://m.twitter.com/\",\n\"ua\": true\n  },\n\"p3\": {\n   \"url\": \"https://www.youtube.com/\",\n\"ua\": true\n},\n\"p4\": {\n   \"url\": \"https://translate.google.com/\",\n\"ua\": true\n},\n\"p5\": {\n   \"url\": \"https://todoist.com/\",\n\"ua\": true\n}},\n\"index\":[\"p1\",\"p2\",\"p3\",\"p4\",\"p5\"]}");
 pref('zen.sidebar.enabled', true);
 pref('zen.sidebar.close-on-blur', true);
@@ -379,6 +386,7 @@ pref("browser.formfill.enable", false);
 pref("security.insecure_connection_text.enabled", true);
 pref("security.insecure_connection_text.pbmode.enabled", true);
 pref("network.IDN_show_punycode", true);
+pref("signon.rememberSignons", false);
 
 // Telemetry
 pref("datareporting.policy.dataSubmissionEnabled", false, locked);

src/browser/base/content/ZenUIManager.mjs

@@ -13,19 +13,14 @@ var gZenUIManager = {
       0
     );
 
-    function throttle(f, delay) {
-      let timer = 0;
-      return function (...args) {
-        clearTimeout(timer);
-        timer = setTimeout(() => f.apply(this, args), delay);
-      };
-    }
-
-    new ResizeObserver(throttle(this.updateTabsToolbar.bind(this), this.sidebarHeightThrottle)).observe(
+    new ResizeObserver(gZenCommonActions.throttle(this.updateTabsToolbar.bind(this), this.sidebarHeightThrottle)).observe(
       document.getElementById('tabbrowser-tabs')
     );
-  },
 
+    new ResizeObserver(gZenCommonActions.throttle(gZenCompactModeManager.getAndApplySidebarWidth.bind(gZenCompactModeManager), this.sidebarHeightThrottle)).observe(
+      document.getElementById('navigator-toolbox')
+    );
+  },
 
   updateTabsToolbar() {
     // Set tabs max-height to the "toolbar-items" height
@@ -280,6 +275,12 @@ var gZenVerticalTabsManager = {
     this._isUpdating = true;
     try {
       this._updateMaxWidth();
+
+      window.docShell.treeOwner
+        .QueryInterface(Ci.nsIInterfaceRequestor)
+        .getInterface(Ci.nsIAppWindow)
+        .rollupAllPopups();
+
       const topButtons = document.getElementById('zen-sidebar-top-buttons');
       const isCompactMode = this._prefsCompactMode;
       const isVerticalTabs = this._prefsVerticalTabs || forceMultipleToolbar;

src/browser/base/content/appmenu-viewcache-inc-xhtml.patch

@@ -0,0 +1,15 @@
+diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml
+index 3c5c4f29b1de25a4ce17089502f2251a27e5c7f5..dfa3260ed3c2bb6067745696fbf103c7e56c639a 100644
+--- a/browser/base/content/appmenu-viewcache.inc.xhtml
++++ b/browser/base/content/appmenu-viewcache.inc.xhtml
+@@ -421,6 +421,10 @@
+                      class="subviewbutton"
+                      data-l10n-id="appmenu-customizetoolbar"
+                      command="cmd_CustomizeToolbars"/>
++      <toolbarbutton id="appmenu-zen-share-rice"
++        class="subviewbutton"
++        data-l10n-id="appmenu-zen-share-rice"
++        oncommand="gZenThemePicker.shareTheme()" />
+       <toolbarseparator/>
+       <html:h2 id="appmenu-developer-tools"
+           data-l10n-id="appmenu-developer-tools-subheader"

src/browser/base/content/zen-assets.inc.xhtml

@@ -1,6 +1,6 @@
 #include zen-locales.inc.xhtml
 
-<!-- Styles used all over the browser -->
+# Styles used all over the browser
 <linkset>
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-theme.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-animations.css" />
@@ -10,6 +10,7 @@
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-tabs.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-browser-ui.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-gradient-generator.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-rices.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-panel-ui.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-single-components.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-browser-container.css" />
@@ -25,7 +26,7 @@
 <link rel="stylesheet" type="text/css" href="chrome://browser/skin/zen-icons/icons.css" />
 </linkset>
 
-<!-- Scripts used all over the browser -->
+# Scripts used all over the browser
 <script src="chrome://browser/content/zen-components/ZenThemesCommon.mjs" />
 <script src="chrome://browser/content/zen-components/ZenActorsManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenGlanceManager.mjs" />
@@ -40,3 +41,6 @@
 <script src="chrome://browser/content/zen-components/ZenGradientGenerator.mjs" />
 <script src="chrome://browser/content/zen-components/ZenViewSplitter.mjs"/>
 <script src="chrome://browser/content/zen-components/ZenProfileDialogUI.mjs" />
+
+# Unimportant scripts
+<script src="chrome://browser/content/zen-components/ZenRices.mjs" />

src/browser/base/content/zen-assets.jar.inc.mn

@@ -22,6 +22,7 @@
         content/browser/zen-components/ZenGradientGenerator.mjs (zen-components/ZenGradientGenerator.mjs)
         content/browser/zen-components/ZenGlanceManager.mjs     (zen-components/ZenGlanceManager.mjs)
         content/browser/zen-components/ZenActorsManager.mjs     (zen-components/ZenActorsManager.mjs)
+        content/browser/zen-components/ZenRices.mjs             (zen-components/ZenRices.mjs)
 
         content/browser/zen-styles/zen-theme.css                (content/zen-styles/zen-theme.css)
         content/browser/zen-styles/zen-buttons.css              (content/zen-styles/zen-buttons.css)
@@ -43,6 +44,7 @@
         content/browser/zen-styles/zen-popup.css                (content/zen-styles/zen-popup.css)
         content/browser/zen-styles/zen-sidebar-panels.css       (content/zen-styles/zen-sidebar-panels.css)
         content/browser/zen-styles/zen-gradient-generator.css   (content/zen-styles/zen-gradient-generator.css)
+        content/browser/zen-styles/zen-rices.css                (content/zen-styles/zen-rices.css)
         content/browser/zen-styles/zen-branding.css             (content/zen-styles/zen-branding.css)
 
         content/browser/zen-styles/zen-panels/bookmarks.css     (content/zen-styles/zen-panels/bookmarks.css)
@@ -55,6 +57,7 @@
         # Images
         content/browser/zen-images/gradient.png                 (content/zen-images/gradient.png)
         content/browser/zen-images/gradient-display.png         (content/zen-images/gradient-display.png)
+        content/browser/zen-images/brand-header.svg             (content/zen-images/brand-header.svg)
         content/browser/zen-images/layouts/collapsed.png        (content/zen-images/layouts/collapsed.png)
         content/browser/zen-images/layouts/multiple-toolbar.png (content/zen-images/layouts/multiple-toolbar.png)
         content/browser/zen-images/layouts/single-toolbar.png   (content/zen-images/layouts/single-toolbar.png)
@@ -68,3 +71,6 @@
         # Fonts
         content/browser/zen-fonts/JunicodeVF-Italic.woff2       (content/zen-fonts/JunicodeVF-Italic.woff2)
         content/browser/zen-fonts/JunicodeVF-Roman.woff2        (content/zen-fonts/JunicodeVF-Roman.woff2)
+
+        # JS Vendor
+        content/browser/zen-vendor/tsparticles.confetti.bundle.min.js (content/zen-vendor/tsparticles.confetti.bundle.min.js)

src/browser/base/content/zen-popupset.inc.xhtml

@@ -104,7 +104,8 @@
 <panel flip="side" type="arrow" orient="vertical" id="PanelUI-zen-gradient-generator" position="bottomright topright" mainview="true" side="left" onpopuphidden="gZenThemePicker.handlePanelClose();">
   <panelmultiview id="PanelUI-zen-gradient-generator-multiview" mainViewId="PanelUI-zen-gradient-generator-view">
     <panelview id="PanelUI-zen-gradient-generator-view" class="PanelUI-subView zen-theme-picker" role="document" mainview-with-header="true" has-custom-header="true">
-      <hbox class="zen-theme-picker-gradient"></hbox>
+      <hbox class="zen-theme-picker-gradient">
+      </hbox>
       <hbox id="PanelUI-zen-gradient-generator-controls">
         <vbox id="PanelUI-zen-gradient-generator-options">
           <hbox id="PanelUI-zen-gradient-degrees">

src/browser/base/content/zen-sidebar-panel.inc.xhtml

@@ -16,8 +16,8 @@
     </toolbar>
     <vbox id="zen-sidebar-web-panel-browser-containers">
       <vbox id="zen-sidebar-introduction-panel" hidden="true">
-        <html:h1 data-l10n-id="zen-sidebar-introduction-title"/>
-        <html:p data-l10n-id="zen-sidebar-introduction-description"/>
+        <html:h1 data-l10n-id="zen-webpanel-introduction-title"/>
+        <html:p data-l10n-id="zen-webpanel-introduction-description"/>
       </vbox>
     </vbox>
     <toolbar mode="icons" flex="1" id="zen-sidebar-panels-wrapper" fullscreentoolbar="true">

src/browser/base/content/zen-styles/zen-animations.css

@@ -1,8 +1,28 @@
+/*
+ * 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/.
+ */
 @keyframes zen-jello-animation {
   0% {
     transform: scale3d(0.8, 0.8, 0.8);
   }
 
+  60% {
+    transform: scale3d(1.01, 1.01, 1.01);
+  }
+
+  to {
+    opacity: 1;
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+@keyframes zen-jello-animation-large {
+  0% {
+    transform: scale3d(0.8, 0.8, 0.8);
+  }
+
   60% {
     transform: scale3d(1.02, 1.02, 1.02);
   }
@@ -71,7 +91,7 @@
 
 @keyframes zen-slide-in {
   from {
-    transform: translateX(-100%);
+    transform: translateX(-150%);
     opacity: 0;
   }
   to {
@@ -82,7 +102,7 @@
 
 @keyframes zen-slide-in-reverse {
   from {
-    transform: translateX(100%);
+    transform: translateX(150%);
     opacity: 0;
   }
   to {
@@ -344,3 +364,79 @@
     transform: translateX(-100%) translateY(-50%);
   }
 }
+
+@keyframes zen-rice-form-out {
+  0% {
+    transform: translateX(0);
+    max-height: 350px;
+    opacity: 1;
+    position: relative;
+  }
+
+  50% {
+    transform: translateX(-100%);
+    opacity: 0;
+    position: relative;
+  }
+
+  99% {
+    transform: translateX(-100%);
+    opacity: 0;
+    max-height: 15px;
+    position: relative;
+  }
+
+  100% {
+    transform: translateX(-100%);
+    opacity: 0;
+    pointer-events: none;
+    position: absolute;
+  }
+}
+
+@keyframes zen-rice-form-in {
+  0% {
+    position: absolute;
+    transform: translateX(100%);
+    opacity: 0;
+  }
+
+  99% {
+    position: absolute;
+    transform: translateX(0);
+    opacity: 1;
+  }
+
+  100% {
+    position: relative;
+  }
+}
+
+@keyframes zen-rice-form-in-2 {
+  from {
+    opacity: 0;
+    transform: translateX(100%);
+    max-height: 50px;
+  }
+
+  to {
+    opacity: 1;
+    transform: translateX(0);
+    max-height: 450px;
+  }
+}
+
+@keyframes zen-rice-submit-animation {
+  /* Scale and shake the dialog */
+  0% {
+    transform: scale(1);
+  }
+
+  50% {
+    transform: scale(1.1);
+  }
+
+  100% {
+    transform: scale(1);
+  }
+}

src/browser/base/content/zen-styles/zen-branding.css

@@ -1,3 +1,8 @@
+/*
+ * 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/.
+ */
 
 @font-face {
   font-family: 'Zen-Junicode';

src/browser/base/content/zen-styles/zen-browser-container.css

@@ -1,3 +1,8 @@
+/*
+ * 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/.
+ */
 :root:not([inDOMFullscreen='true']):not([chromehidden~='location']):not([chromehidden~='toolbar']) {
   & #tabbrowser-tabbox #tabbrowser-tabpanels .browserSidebarContainer {
     width: -moz-available;