diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
index e18a81c4b..90bf0d9d7 100644
--- a/.github/workflows/alpha.yml
+++ b/.github/workflows/alpha.yml
@@ -314,6 +314,7 @@ jobs:
run: |
pnpm package
mv ./dist/output.mar windows.mar
+ mv ./dist/zen-$(gluon get version | xargs).en-US.win64.zip zen.en-US.win64.zip
ls ./dist
- name: Upload artifact
uses: actions/upload-artifact@v3
@@ -321,6 +322,12 @@ jobs:
name: zen.installer.exe
path: ./dist/zen.installer.exe
+ - name: Upload artifact
+ uses: actions/upload-artifact@v3
+ with:
+ name: zen.en-US.win64.zip
+ path: ./dist/zen.en-US.win64.zip
+
- name: Upload mar
uses: actions/upload-artifact@v3
with:
@@ -517,7 +524,7 @@ jobs:
title: 'Alpha build'
files: |
zen.linux.tar.bz2
- zen.installer.exe
+ zen-1.0.0-a.33.en-US.win64.zip
zen.source.tar.gz
linux.mar
windows.mar
diff --git a/src/browser/base/content/zen-panels-ui.inc.xhtml b/src/browser/base/content/zen-panels-ui.inc.xhtml
index fe96a76f2..84e3de176 100644
--- a/src/browser/base/content/zen-panels-ui.inc.xhtml
+++ b/src/browser/base/content/zen-panels-ui.inc.xhtml
@@ -7,9 +7,11 @@
-
+#if 0
+
+#endif
diff --git a/src/browser/locales/en-US/browser/appmenu-ftl.patch b/src/browser/locales/en-US/browser/appmenu-ftl.patch
index 10aaf9cb8..d9e52c29f 100644
--- a/src/browser/locales/en-US/browser/appmenu-ftl.patch
+++ b/src/browser/locales/en-US/browser/appmenu-ftl.patch
@@ -1,5 +1,5 @@
diff --git a/browser/locales/en-US/browser/appmenu.ftl b/browser/locales/en-US/browser/appmenu.ftl
-index 5ad2d75f6215f7da44948cda5ad938db8fd97e8d..dfc551d8d3227e9b5d1d0c9d3380fd0ad85ca65e 100644
+index 5ad2d75f6215f7da44948cda5ad938db8fd97e8d..da4442ebcd594b602b9e991c9591071dddcaa5f6 100644
--- a/browser/locales/en-US/browser/appmenu.ftl
+++ b/browser/locales/en-US/browser/appmenu.ftl
@@ -314,3 +314,5 @@ appmenuitem-relay-title = { -relay-brand-short-name }
@@ -7,4 +7,4 @@ index 5ad2d75f6215f7da44948cda5ad938db8fd97e8d..dfc551d8d3227e9b5d1d0c9d3380fd0a
appmenuitem-vpn-title = { -mozilla-vpn-brand-name }
appmenuitem-vpn-description = Protect your online activity
+
-+zen-panel-ui-current-profile-text = Current Profile
++zen-panel-ui-current-profile-text = current profile
diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css
index 657b2ac94..acb41f739 100644
--- a/src/browser/themes/shared/zen-browser-shared.css
+++ b/src/browser/themes/shared/zen-browser-shared.css
@@ -39,7 +39,7 @@
/* URL and tool bars */
#urlbar {
- border: 1px solid light-dark(#ddd, #4a4a4a);
+ border: transparent;
overflow: hidden;
padding: 1px;
}
@@ -56,7 +56,7 @@
#urlbar[focused="true"] > #urlbar-background,
#searchbar:focus-within {
- border-color: var(--urlbarView-separator-color) !important;
+ border-color: transparent !important;
}
#urlbar[focused="true"] {
@@ -447,7 +447,7 @@ panelmultiview {
#tabbrowser-tabbox[inlinedwithsidebar="true"] #tabbrowser-tabpanels .browserSidebarContainer {
border-radius: var(--zen-browser-border-radius);
- border: 1px solid light-dark(#ddd, #4a4a4a);
+ border: var(--zen-appcontent-border);
width: 100%;
margin: 0 10px 10px 0;
}
diff --git a/src/browser/themes/shared/zen-panel-ui.css b/src/browser/themes/shared/zen-panel-ui.css
index 3aeeb6620..7abae5aed 100644
--- a/src/browser/themes/shared/zen-panel-ui.css
+++ b/src/browser/themes/shared/zen-panel-ui.css
@@ -6,25 +6,24 @@
}
#PanelUI-zen-profiles-header {
- width: -moz-available;
- height: 100px;
- background: var(--zen-main-browser-background);
+ width: 280px;
+ height: 130px;
+ background: var(--zen-colors-primary-foreground);
position: relative;
}
#PanelUI-zen-profiles-user-picture {
background-image: var(--avatar-image-url);
- width: 80px;
- height: 80px;
- min-width: 80px;
- border: 5px var(--arrowpanel-background) solid;
- background-color: var(--arrowpanel-background);
+ width: 75px;
+ height: 75px;
+ border: 4px var(--arrowpanel-background) solid;
+ background-color: var(--zen-colors-primary-foreground);
border-radius: 50%;
background-repeat: no-repeat;
background-size: cover;
background-position: center;
margin: 0 auto;
- transform: translateY(60%);
+ transform: translateY(100%);
}
.PanelUI-zen-profiles-item {
@@ -86,12 +85,13 @@
}
#PanelUI-zen-profiles-current-info {
- margin-top: 60px;
+ --zen-separation-from-content: 35px;
+ margin-top: calc(var(--zen-separation-from-content) + 30px); /** Ignore the profile picture */
}
#PanelUI-zen-profiles-current-name {
- font-size: 1.4em;
- font-weight: 500;
+ font-size: 1.3em;
+ font-weight: 600;
line-height: 0.5;
padding: 5px 10px;
border-radius: 5px;
@@ -116,7 +116,9 @@
#PanelUI-zen-profiles-current-profile-current {
font-size: 13px;
opacity: 0.5;
- margin: 0 auto 15px auto;
+ margin: 0 auto var(--zen-separation-from-content) auto;
+ font-size: 15px;
+ font-weight: 600;
}
@@ -127,7 +129,7 @@
border-radius: 5px !important;
padding: 5px !important;
transition: .1s;
- color: light-dark(black, white);
+ color: light-dark(white, black);
}
#PanelUI-zen-profiles-managePrfs:hover {
diff --git a/src/toolkit/content/zen-xul.css b/src/toolkit/content/zen-xul.css
index cb0628ac9..1f0e27d61 100644
--- a/src/toolkit/content/zen-xul.css
+++ b/src/toolkit/content/zen-xul.css
@@ -6,7 +6,7 @@
--zen-appcontent-separator-from-window-single: 7px;
--zen-appcontent-separator-from-window: var(--zen-appcontent-separator-from-window-single);
--zen-appcontent-border-radius: var(--zen-panel-radius);
- --zen-appcontent-border: 1px solid light-dark(#ddd, #4a4a4a);
+ --zen-appcontent-border: 2px solid var(--zen-colors-border);
--zen-browser-border-radius: 10px;
}
diff --git a/src/toolkit/themes/shared/in-content/zen-common-shared.css b/src/toolkit/themes/shared/in-content/zen-common-shared.css
index a8f94b353..ae8622ffb 100644
--- a/src/toolkit/themes/shared/in-content/zen-common-shared.css
+++ b/src/toolkit/themes/shared/in-content/zen-common-shared.css
@@ -25,7 +25,7 @@
--zen-colors-hover-bg: color-mix(in srgb, var(--zen-primary-color) 90%, white 10%);
--zen-colors-primary-foreground: color-mix(in srgb, var(--zen-primary-color) 80%, black 20%);
- --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 40%, black 60%);
+ --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 70%, black 30%);
--zen-colors-input-bg: color-mix(in srgb, var(--zen-primary-color) 10%, white 80%);
@@ -58,8 +58,8 @@
--in-content-page-background: var(--zen-colors-tertiary) !important;
--zen-in-content-dialog-background: var(--zen-colors-tertiary);
- --zen-button-border-radius: 999px;
- --zen-button-padding: 0.9em 2.3em;
+ --zen-button-border-radius: 7px;
+ --zen-button-padding: 10px 14px;
/* Other colors */
--urlbar-box-bgcolor: light-dark(white, rgb(66, 65, 77)) !important;
@@ -79,7 +79,6 @@
--zen-colors-hover-bg: color-mix(in srgb, var(--zen-primary-color) 90%, black 10%);
--zen-colors-primary-foreground: color-mix(in srgb, var(--zen-primary-color) 80%, white 20%);
- --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 40%, black 60%);
--zen-colors-input-bg: color-mix(in srgb, var(--zen-primary-color) 10%, black 80%);
diff --git a/src/toolkit/themes/shared/popup-css.patch b/src/toolkit/themes/shared/popup-css.patch
index 9a31d93be..83efb1a2e 100644
--- a/src/toolkit/themes/shared/popup-css.patch
+++ b/src/toolkit/themes/shared/popup-css.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css
-index ddc41a66ed0e3688ce34052652bef1fe33a08d49..78005dc087044ed57e974f6aa18dd23d61bdb76b 100644
+index 1426f9c4f6f24f19277006ead43eb88a50a408e5..8f8da0189772e00fb787d6708fce0481e52eaf39 100644
--- a/toolkit/themes/shared/popup.css
+++ b/toolkit/themes/shared/popup.css
@@ -2,6 +2,8 @@
@@ -20,9 +20,10 @@ index ddc41a66ed0e3688ce34052652bef1fe33a08d49..78005dc087044ed57e974f6aa18dd23d
--panel-color: MenuText;
--panel-padding-block: 4px;
- --panel-padding: var(--panel-padding-block) 0;
-+ --panel-padding: var(--panel-padding-block) 0 5px 0;
- --panel-border-radius: 4px;
+- --panel-border-radius: 4px;
- --panel-border-color: ThreeDShadow;
++ --panel-padding: var(--panel-padding-block) 0 5px 0;
++ --panel-border-radius: 10px;
+ --panel-border-color: transparent /* var(--arrowpanel-border-color) */ !important;
--panel-width: initial;
diff --git a/src/toolkit/themes/shared/zen-global-shared.css b/src/toolkit/themes/shared/zen-global-shared.css
index 801acbca8..7edb62f75 100644
--- a/src/toolkit/themes/shared/zen-global-shared.css
+++ b/src/toolkit/themes/shared/zen-global-shared.css
@@ -6,7 +6,7 @@
--arrowpanel-background: var(--zen-dialog-background) !important;
--arrowpanel-border-color: var(--zen-dialog-border-color) !important;
- --arrowpanel-border-radius: 15px !important;
+ --arrowpanel-border-radius: 12px !important;
&:-moz-lwtheme {
color: var(--lwt-text-color);
diff --git a/src/toolkit/themes/shared/zen-popup.css b/src/toolkit/themes/shared/zen-popup.css
index 6b840f62c..cec47fc69 100644
--- a/src/toolkit/themes/shared/zen-popup.css
+++ b/src/toolkit/themes/shared/zen-popup.css
@@ -229,7 +229,7 @@
menupopup::part(content),
panel::part(content) {
- border: transparent !important;
+ border: var(--zen-appcontent-border) !important;
}
menupopup,