Merge branch 'dev' into new-color-picker

src/browser/base/content/ZenStartup.mjs

@@ -122,7 +122,7 @@
 
     _checkForWelcomePage() {
       if (!Services.prefs.getBoolPref('zen.welcome-screen.seen', false)) {
-        Services.prefs.setBoolPref('zen.welcome-screen.seen', true);
+        //Services.prefs.setBoolPref('zen.welcome-screen.seen', true);
         Services.scriptloader.loadSubScript('chrome://browser/content/zen-components/ZenWelcome.mjs', window);
       }
     },

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

@@ -58,7 +58,7 @@
 
   @media (not (-moz-windows-mica)) and (-moz-bool-pref: 'zen.view.grey-out-inactive-windows') {
     transition: color var(--inactive-window-transition);
-    &:-moz-window-inactive {
+    :root:not([zen-welcome-stage]) &:-moz-window-inactive {
       color: var(--toolbox-textcolor-inactive);
       &::after {
         background-color: var(--toolbox-bgcolor-inactive);

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

@@ -88,10 +88,6 @@ panel {
   padding-inline-start: calc(16px + var(--uc-arrowpanel-menuicon-margin-inline));
 }
 
-.subviewbutton > .toolbarbutton-icon {
-  width: 15px;
-}
-
 /* firefox profile avatar in appmenu */
 #appMenu-fxa-label2::before {
   content: '';

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

@@ -138,6 +138,9 @@
   --fp-contextmenu-menuitem-border-radius: calc(4px + var(--fp-contextmenu-menuitem-border-width));
   --fp-contextmenu-menuitem-padding-block: 6px;
   --fp-contextmenu-menuitem-padding-inline: 10px;
+  @media (-moz-platform: windows) {
+    --fp-contextmenu-menuitem-padding-inline: 8px;
+  }
   --fp-contextmenu-menuitem-border-width: 2px;
   --fp-contextmenu-menuicon-margin-inline: 12px;
   --fp-contextmenu-menuitem-margin-inline: calc(4px - var(--fp-contextmenu-menuitem-border-width));

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

@@ -126,6 +126,10 @@
   backdrop-filter: none !important;
 }
 
+#urlbar-go-button {
+  margin: auto 0;
+}
+
 :root[zen-single-toolbar='true'] {
   .urlbar-page-action:not([open]),
   #tracking-protection-icon-container {

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

@@ -145,6 +145,12 @@
       }
     }
 
+    #zen-welcome-workspace-colors-anchor {
+      width: 1px;
+      height: 1px;
+      margin: 10% auto auto 30%;
+    }
+
     #zen-welcome-initial-essentials-browser {
       width: 70%;
       height: 80%;
@@ -180,8 +186,8 @@
         }
 
         #zen-welcome-initial-essentials-browser-sidebar-essentials {
-          display: flex;
-          flex-wrap: wrap;
+          display: grid;
+          grid-template-columns: repeat(3, 1fr);
           gap: 0.8rem;
           visibility: visible;
 
@@ -195,6 +201,7 @@
             border-radius: 0.8rem;
             margin-top: 0.5rem;
             background: var(--zen-toolbar-element-bg);
+            grid-column: span 3;
           }
 
           & .tabbrowser-tab {