Added UI changes to password site and popups. Also added a window separator for native vs website contents

This commit is contained in:
mauro-balades
2024-03-30 16:06:35 +01:00
parent d0f7293b93
commit 66b15e0989
18 changed files with 671 additions and 46 deletions

View File

@@ -1 +1 @@
25
31

View File

@@ -49,6 +49,7 @@ pref('browser.urlbar.weather.featureGate', true);
// new tab page
pref('browser.newtabpage.activity-stream.feeds.topsites', false);
pref('browser.newtabpage.activity-stream.feeds.section.topstories', false);
pref("browser.topsites.contile.enabled", false);
// Pocket
pref('extensions.pocket.enabled', false);

View File

@@ -1,5 +1,5 @@
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 8a2a20280954eb9db144a723f477e7afc603fda3..0536187962cd2f276c5d7f80d78433b3711a2995 100644
index 8a2a20280954eb9db144a723f477e7afc603fda3..5688021b08b378e48bb100621fbdc0c5c05fc634 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -2,6 +2,8 @@
@@ -11,6 +11,15 @@ index 8a2a20280954eb9db144a723f477e7afc603fda3..0536187962cd2f276c5d7f80d78433b3
@namespace html url("http://www.w3.org/1999/xhtml");
:root,
@@ -1321,7 +1323,7 @@ printpreview-pagination:focus-within,
#sidebar-box {
min-width: 14em;
max-width: 36em;
- width: 18em;
+ width: 269px;
}
/* WebExtension Sidebars */
@@ -1526,3 +1528,19 @@ toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
/**
* End Dialogs

View File

@@ -0,0 +1,32 @@
diff --git a/browser/base/content/browser-siteProtections.js b/browser/base/content/browser-siteProtections.js
index 5364aa74cd938141e85e3a3333e8d1fa58ea3ae4..5cd1748a883b19caa2977c1047d51b9551686bf4 100644
--- a/browser/base/content/browser-siteProtections.js
+++ b/browser/base/content/browser-siteProtections.js
@@ -1904,9 +1904,14 @@ var gProtectionsHandler = {
// the information contained there would mostly be broken and/or
// irrelevant anyway.
this._trackingProtectionIconContainer.hidden = true;
+ // ZEN: We make a clear distinction between native UI and websites for security reasons.
+ // we can remove the separator for websites that dont need it, like "about:*" pages, where
+ // they are safe to use.
+ this._nativeSeparatorForWebsitesContainer.hidden = true;
return;
}
this._trackingProtectionIconContainer.hidden = false;
+ this._nativeSeparatorForWebsitesContainer.hidden = false;
// Check whether the user has added an exception for this site.
this.hasException = ContentBlockingAllowList.includes(
@@ -2882,4 +2887,12 @@ var gProtectionsHandler = {
return messageEl;
},
+
+ get _nativeSeparatorForWebsitesContainer() {
+ delete this._nativeSeparatorForWebsitesContainer;
+ return (this._nativeSeparatorForWebsitesContainer = document.getElementById(
+ "zen-website-and-native-separator"
+ ));
+ },
+
};

View File

@@ -73,20 +73,6 @@
class="chromeclass-toolbar-additional"/>
<!-- Use onclick instead of normal popup= syntax since the popup
code fires onmousedown, and hence eats our favicon drag events. -->
<box id="tracking-protection-icon-container" align="center"
role="button"
onclick="gProtectionsHandler.handleProtectionsButtonEvent(event);"
onkeypress="gProtectionsHandler.handleProtectionsButtonEvent(event);"
onmouseover="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
onfocus="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
tooltip="tracking-protection-icon-tooltip">
<box id="tracking-protection-icon-box">
<image id="tracking-protection-icon"/>
</box>
<tooltip id="tracking-protection-icon-tooltip">
<description id="tracking-protection-icon-tooltip-label" class="tooltip-label"/>
</tooltip>
</box>
<box id="identity-box"
pageproxystate="invalid"
ondragstart="gIdentityHandler.onDragStart(event);">
@@ -223,6 +209,20 @@
keyNav="false"
onclick="gURLBar.handleCommand(event);"
data-l10n-id="urlbar-go-button"/>
<box id="tracking-protection-icon-container" align="center"
role="button"
onclick="gProtectionsHandler.handleProtectionsButtonEvent(event);"
onkeypress="gProtectionsHandler.handleProtectionsButtonEvent(event);"
onmouseover="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
onfocus="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
tooltip="tracking-protection-icon-tooltip">
<box id="tracking-protection-icon-box">
<image id="tracking-protection-icon"/>
</box>
<tooltip id="tracking-protection-icon-tooltip">
<description id="tracking-protection-icon-tooltip-label" class="tooltip-label"/>
</tooltip>
</box>
<hbox id="page-action-buttons" context="pageActionContextMenu" align="center">
<toolbartabstop/>
<hbox id="contextual-feature-recommendation" role="button" hidden="true">
@@ -466,3 +466,5 @@
<html:template id="tab-notification-deck-template">
<html:named-deck id="tab-notification-deck"></html:named-deck>
</html:template>
<html:span id="zen-website-and-native-separator"></html:span>

View File

@@ -0,0 +1,22 @@
diff --git a/browser/components/aboutlogins/content/components/login-list.css b/browser/components/aboutlogins/content/components/login-list.css
index bc8e72a3cd07e8746c6fbf190bdd2bf70f4000d4..07031dfdfadf393db5fd848948e33510bd7225d7 100644
--- a/browser/components/aboutlogins/content/components/login-list.css
+++ b/browser/components/aboutlogins/content/components/login-list.css
@@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
:host {
- border-inline-end: 1px solid var(--in-content-border-color);
+ border: 1px solid var(--in-content-border-color);
background-color: var(--in-content-box-background);
display: flex;
flex-direction: column;
@@ -161,3 +161,8 @@ ol {
font-size: 0.85em;
color: var(--text-color-deemphasized);
}
+
+:host {
+ border-radius: 5px;
+ margin: 10px;
+}

View File

@@ -0,0 +1,13 @@
diff --git a/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx b/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
index 57ed935e93198bb50555d119080552934c49e428..21e8fb35501091d448502dbd0c53ee01ce8b7bc0 100644
--- a/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
+++ b/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
@@ -153,7 +153,7 @@ export class ContentSection extends React.PureComponent {
data-l10n-args='{"num": 4}'
/>
</select>
- {mayHaveSponsoredTopSites && (
+ {false && (
<div className="check-wrapper" role="presentation">
<input
id="sponsored-shortcuts"

View File

@@ -0,0 +1,13 @@
diff --git a/browser/components/newtab/lib/AboutPreferences.sys.mjs b/browser/components/newtab/lib/AboutPreferences.sys.mjs
index 33f7ecdaeb7074c7633dd229a4446f2a8ed4b247..f422a9bfb9694b190e84e81a430a509b4ab8c986 100644
--- a/browser/components/newtab/lib/AboutPreferences.sys.mjs
+++ b/browser/components/newtab/lib/AboutPreferences.sys.mjs
@@ -34,7 +34,7 @@ const PREFS_BEFORE_SECTIONS = () => [
titleString: "home-prefs-shortcuts-header",
descString: "home-prefs-shortcuts-description",
get nestedPrefs() {
- return Services.prefs.getBoolPref("browser.topsites.useRemoteSetting")
+ return Services.prefs.getBoolPref("browser.topsites.useRemoteSetting") && false
? [
{
name: "showSponsoredTopSites",

View File

@@ -0,0 +1,13 @@
diff --git a/browser/components/newtab/lib/ActivityStream.sys.mjs b/browser/components/newtab/lib/ActivityStream.sys.mjs
index f2287fe45edbf4f1e792e3fdcd6886a17c1bb9d2..07437d4fb426919bf8754c01776b00ab06401370 100644
--- a/browser/components/newtab/lib/ActivityStream.sys.mjs
+++ b/browser/components/newtab/lib/ActivityStream.sys.mjs
@@ -127,7 +127,7 @@ export const PREFS_CONFIG = new Map([
"showSponsoredTopSites",
{
title: "Show sponsored top sites",
- value: true,
+ value: false,
},
],
[

View File

@@ -0,0 +1,217 @@
diff --git a/browser/themes/addons/alpenglow/manifest.json b/browser/themes/addons/alpenglow/manifest.json
index 05a25e13915edee3ba51ed1c1b5569faa70cd536..fc9c56843a38fcfbebaf2508a66d0c3b97dfb2f2 100644
--- a/browser/themes/addons/alpenglow/manifest.json
+++ b/browser/themes/addons/alpenglow/manifest.json
@@ -3,137 +3,99 @@
"browser_specific_settings": {
"gecko": {
- "id": "firefox-alpenglow@mozilla.org"
+ "id": "firefox-compact-light@mozilla.org"
}
},
- "name": "Firefox Alpenglow",
- "description": "Use a colorful appearance for buttons, menus, and windows.",
- "version": "1.4",
+ "name": "Zen Universe (Light)",
+ "description": "A theme with a light color scheme.",
+ "author": "Zen",
+ "version": "1.3",
+
"icons": { "32": "icon.svg" },
"theme": {
- "images": {
- "additional_backgrounds": [
- "background-noodles-right.svg",
- "background-noodles-left.svg",
- "background-gradient.svg"
- ]
- },
-
- "properties": {
- "additional_backgrounds_alignment": [
- "right top",
- "left top",
- "right top"
- ],
- "additional_backgrounds_tiling": ["no-repeat", "no-repeat", "repeat-x"],
- "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)"
- },
"colors": {
- "frame": "hsla(240, 20%, 98%, 1)",
- "toolbar": "hsla(0, 0%, 100%, .76)",
- "button_background_active": "hsla(240, 26%, 11%, .16)",
- "button_background_hover": "hsla(240, 26%, 11%, .08)",
- "icons": "hsla(258, 66%, 48%, 1)",
- "icons_attention": "hsla(180, 100%, 32%, 1)",
- "toolbar_text": "hsla(261, 53%, 15%, 1)",
- "toolbar_vertical_separator": "hsla(261, 53%, 15%, .2)",
- "toolbar_field": "hsla(0, 0%, 100%, .8)",
- "toolbar_field_focus": "hsla(261, 53%, 15%, .96)",
- "toolbar_field_text": "hsla(261, 53%, 15%, 1)",
- "toolbar_field_text_focus": "hsla(255, 100%, 94%, 1)",
- "toolbar_field_border": "transparent",
- "toolbar_field_border_focus": "hsla(265, 100%, 72%, 1)",
- "toolbar_field_highlight": "hsla(265, 100%, 72%, .32)",
+ "tab_background_text": "rgb(21,20,26)",
+ "tab_selected": "#fff",
+ "tab_text": "rgb(21,20,26)",
+ "icons": "rgb(91,91,102)",
+ "frame": "rgb(240, 240, 244)",
+ "frame_inactive": "rgb(235, 235, 239)",
+ "popup": "#fff",
+ "popup_text": "rgb(21,20,26)",
+ "popup_border": "rgb(240,240,244)",
+ "popup_highlight": "#e0e0e6",
+ "popup_highlight_text": "#15141a",
+ "tab_line": "transparent",
+ "toolbar": "#f9f9fb",
"toolbar_top_separator": "transparent",
- "toolbar_bottom_separator": "hsla(261, 53%, 15%, .32)",
- "bookmark_text": "hsla(261, 53%, 15%, 1)",
- "tab_text": "hsla(261, 53%, 15%, 1)",
- "tab_background_text": "hsla(261, 53%, 15%, 1)",
- "tab_background_separator": "hsla(261, 53%, 15%, 1)",
- "tab_line": "hsla(265, 100%, 72%, 1)",
- "tab_loading": "hsla(265, 100%, 72%, 1)",
+ "toolbar_bottom_separator": "#ccc",
+ "toolbar_field": "rgb(240, 240, 244)",
+ "toolbar_field_text": "rgb(21, 20, 26)",
+ "toolbar_field_border": "transparent",
+ "toolbar_field_focus": "white",
+ "toolbar_text": "rgb(21,20,26)",
"ntp_background": "#F9F9FB",
- "ntp_text": "hsla(261, 53%, 15%, 1)",
- "popup": "hsla(254, 46%, 21%, 1)",
- "popup_text": "hsla(255, 100%, 94%, 1)",
- "popup_border": "hsla(255, 100%, 94%, .32)",
- "popup_highlight": "hsla(255, 100%, 94%, .12)",
- "popup_highlight_text": "hsla(0, 0%, 100%, 1)",
- "sidebar": "hsla(240, 15%, 95%, 1)",
- "sidebar_text": "hsla(261, 53%, 15%, 1)",
- "sidebar_border": "hsla(261, 53%, 15%, .24)",
- "sidebar_highlight": "hsla(265, 100%, 72%, 1)",
- "sidebar_highlight_text": "hsla(0, 0%, 100%, 1)",
- "focus_outline": "hsla(258, 65%, 48%, 1)"
- }
- },
- "dark_theme": {
- "images": {
- "additional_backgrounds": [
- "background-noodles-right-dark.svg",
- "background-noodles-left-dark.svg",
- "background-gradient-dark.svg"
- ]
+ "ntp_text": "rgb(21, 20, 26)",
+ "popup_action_color": "rgb(91,91,102)",
+ "button": "rgba(207,207,216,.33)",
+ "button_hover": "rgba(207,207,216,.66)",
+ "button_active": "rgb(207,207,216)",
+ "button_primary": "#000",
+ "button_primary_hover": "rgb(31, 31, 31)",
+ "button_primary_active": "rgb(207,207,216)",
+ "button_primary_color": "#fff",
+ "input_color": "rgb(21,20,26)",
+ "input_background": "#f0f0f4",
+ "urlbar_popup_hover": "rgb(240,240,244)",
+ "urlbar_popup_separator": "rgb(240,240,244)",
+ "appmenu_update_icon_color": "#2AC3A2",
+ "appmenu_info_icon_color": "#0090ED",
+ "tab_icon_overlay_stroke": "rgb(255,255,255)",
+ "tab_icon_overlay_fill": "rgb(91,91,102)"
},
-
"properties": {
- "additional_backgrounds_alignment": [
- "right top",
- "left top",
- "right top"
- ],
- "additional_backgrounds_tiling": ["no-repeat", "no-repeat", "repeat-x"],
- "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)"
- },
- "colors": {
- "frame": "hsla(240, 20%, 98%, 1)",
- "toolbar": "hsla(254, 46%, 21%, .96)",
- "button_background_active": "hsla(255, 100%, 94%, .24)",
- "button_background_hover": "hsla(255, 100%, 94%, .12)",
- "icons": "hsla(271, 100%, 77%, 1)",
- "icons_attention": "hsla(157, 100%, 66%, 1)",
- "toolbar_text": "hsla(255, 100%, 94%, 1)",
- "toolbar_vertical_separator": "hsla(271, 100%, 77%, .4)",
- "toolbar_field": "hsla(250, 43%, 25%, 1)",
- "toolbar_field_focus": "hsla(250, 43%, 25%, .98)",
- "toolbar_field_text": "hsla(255, 100%, 94%, 1)",
- "toolbar_field_text_focus": "hsla(255, 100%, 94%, 1)",
- "toolbar_field_border": "transparent",
- "toolbar_field_border_focus": "hsla(265, 100%, 72%, 1)",
- "toolbar_field_highlight": "hsla(265, 100%, 72%, .32)",
- "toolbar_top_separator": "transparent",
- "toolbar_bottom_separator": "hsla(245, 38%, 33%, .96)",
- "bookmark_text": "hsla(255, 100%, 94%, 1)",
- "tab_selected": "rgb(60, 31, 123)",
- "tab_text": "hsla(255, 100%, 94%, 1)",
- "tab_background_text": "hsla(255, 100%, 94%, 1)",
- "tab_background_separator": "hsla(255, 100%, 94%, 1)",
- "tab_line": "hsla(265, 100%, 72%, 1)",
- "tab_loading": "hsla(265, 100%, 72%, 1)",
- "ntp_background": "#2A2A2E",
- "ntp_text": "hsla(255, 100%, 94%, 1)",
- "popup": "hsla(250, 43%, 25%, 1)",
- "popup_text": "hsla(255, 100%, 94%, 1)",
- "popup_border": "hsla(255, 100%, 94%, .32)",
- "popup_highlight": "hsla(255, 100%, 94%, .12)",
- "popup_highlight_text": "hsla(0, 0%, 100%, 1)",
- "sidebar": "hsla(250, 43%, 25%, 1)",
- "sidebar_text": "hsla(255, 100%, 94%, 1)",
- "sidebar_border": "hsla(255, 100%, 94%, .24)",
- "sidebar_highlight": "hsla(259, 76%, 58%, 1)",
- "sidebar_highlight_text": "hsla(0, 0%, 100%, 1)",
- "focus_outline": "hsla(265, 100%, 72%, 1)"
+ "color_scheme": "light",
+ "panel_hover": "color-mix(in srgb, currentColor 12%, transparent)",
+ "panel_active": "color-mix(in srgb, currentColor 20%, transparent)",
+ "panel_active_darker": "color-mix(in srgb, currentColor 27%, transparent)",
+ "toolbar_field_icon_opacity": "0.72",
+ "input_border_color": "rgba(0, 0, 0, .3)",
+ "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
+ "zen_main_browser_background": "linear-gradient(135deg, rgb(254, 181, 188) 0%, rgb(115, 99, 207) 100%)"
}
},
"theme_experiment": {
+ "stylesheet": "experiment.css",
"colors": {
- "focus_outline": "--focus-outline-color"
+ "popup_action_color": "--urlbarView-action-color",
+ "button": "--button-bgcolor",
+ "button_hover": "--button-hover-bgcolor",
+ "button_active": "--button-active-bgcolor",
+ "button_primary": "--button-primary-bgcolor",
+ "button_primary_hover": "--button-primary-hover-bgcolor",
+ "button_primary_active": "--button-primary-active-bgcolor",
+ "button_primary_color": "--button-primary-color",
+ "input_background": "--input-bgcolor",
+ "input_color": "--input-color",
+ "input_border": "--input-border-color",
+ "urlbar_popup_hover": "--urlbarView-hover-background",
+ "urlbar_popup_separator": "--urlbarView-separator-color",
+ "appmenu_update_icon_color": "--panel-banner-item-update-supported-bgcolor",
+ "appmenu_info_icon_color": "--panel-banner-item-info-icon-bgcolor",
+ "tab_icon_overlay_stroke": "--tab-icon-overlay-stroke",
+ "tab_icon_overlay_fill": "--tab-icon-overlay-fill"
},
"properties": {
- "zap_gradient": "--panel-separator-zap-gradient"
+ "panel_hover": "--panel-item-hover-bgcolor",
+ "panel_active": "--arrowpanel-dimmed-further",
+ "panel_active_darker": "--panel-item-active-bgcolor",
+ "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",
+ "input_border_color": "--input-border-color",
+ "zap_gradient": "--panel-separator-zap-gradient",
+ "zen_main_browser_background": "--zen-main-browser-background"
}
}
}

View File

@@ -1,5 +1,5 @@
diff --git a/browser/themes/addons/dark/manifest.json b/browser/themes/addons/dark/manifest.json
index 544986d5e93c033f944cf301af79e0750864a32c..7ecdd33d3af9d859797b0e5ab07ecaa02e17ead6 100644
index 544986d5e93c033f944cf301af79e0750864a32c..ec5e7653b9c0c6d86e5c869c1a5f1d845a0a55f0 100644
--- a/browser/themes/addons/dark/manifest.json
+++ b/browser/themes/addons/dark/manifest.json
@@ -7,10 +7,10 @@
@@ -16,7 +16,7 @@ index 544986d5e93c033f944cf301af79e0750864a32c..7ecdd33d3af9d859797b0e5ab07ecaa0
"icons": { "32": "icon.svg" },
@@ -38,19 +38,18 @@
@@ -38,24 +38,24 @@
"ntp_background": "rgb(43, 42, 51)",
"ntp_card_background": "rgb(66,65,77)",
"ntp_text": "rgb(251, 251, 254)",
@@ -41,3 +41,20 @@ index 544986d5e93c033f944cf301af79e0750864a32c..7ecdd33d3af9d859797b0e5ab07ecaa0
"urlbar_popup_separator": "rgb(82,82,94)",
"appmenu_update_icon_color": "#54FFBD",
"appmenu_info_icon_color": "#80EBFF",
"tab_icon_overlay_stroke": "rgb(66,65,77)",
- "tab_icon_overlay_fill": "rgb(251,251,254)"
+ "tab_icon_overlay_fill": "rgb(251,251,254)",
+ "zen_main_browser_background": "rgb(53, 52, 61)"
},
"properties": {
"color_scheme": "dark",
@@ -83,7 +83,8 @@
"appmenu_update_icon_color": "--panel-banner-item-update-supported-bgcolor",
"appmenu_info_icon_color": "--panel-banner-item-info-icon-bgcolor",
"tab_icon_overlay_stroke": "--tab-icon-overlay-stroke",
- "tab_icon_overlay_fill": "--tab-icon-overlay-fill"
+ "tab_icon_overlay_fill": "--tab-icon-overlay-fill",
+ "zen_main_browser_background": "--zen-main-browser-background"
},
"properties": {
"panel_active": "--arrowpanel-dimmed-further",

View File

@@ -1,5 +1,5 @@
diff --git a/browser/themes/addons/light/manifest.json b/browser/themes/addons/light/manifest.json
index 7385970fa8e3ff9659b72cfb238003958220fb0d..5146d11eedc8f5a997836f747fadfd52c968b84f 100644
index 7385970fa8e3ff9659b72cfb238003958220fb0d..70739d61207c60a1869b6a590c452a8e62698833 100644
--- a/browser/themes/addons/light/manifest.json
+++ b/browser/themes/addons/light/manifest.json
@@ -7,10 +7,10 @@
@@ -16,7 +16,7 @@ index 7385970fa8e3ff9659b72cfb238003958220fb0d..5146d11eedc8f5a997836f747fadfd52
"icons": { "32": "icon.svg" },
@@ -42,12 +42,12 @@
@@ -42,18 +42,19 @@
"button": "rgba(207,207,216,.33)",
"button_hover": "rgba(207,207,216,.66)",
"button_active": "rgb(207,207,216)",
@@ -34,7 +34,15 @@ index 7385970fa8e3ff9659b72cfb238003958220fb0d..5146d11eedc8f5a997836f747fadfd52
"urlbar_popup_hover": "rgb(240,240,244)",
"urlbar_popup_separator": "rgb(240,240,244)",
"appmenu_update_icon_color": "#2AC3A2",
@@ -61,7 +61,7 @@
"appmenu_info_icon_color": "#0090ED",
"tab_icon_overlay_stroke": "rgb(255,255,255)",
- "tab_icon_overlay_fill": "rgb(91,91,102)"
+ "tab_icon_overlay_fill": "rgb(91,91,102)",
+ "zen_main_browser_background": "rgb(229,229,229)"
},
"properties": {
"color_scheme": "light",
@@ -61,7 +62,7 @@
"panel_active": "color-mix(in srgb, currentColor 20%, transparent)",
"panel_active_darker": "color-mix(in srgb, currentColor 27%, transparent)",
"toolbar_field_icon_opacity": "0.72",
@@ -43,3 +51,13 @@ index 7385970fa8e3ff9659b72cfb238003958220fb0d..5146d11eedc8f5a997836f747fadfd52
"zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)"
}
},
@@ -85,7 +86,8 @@
"appmenu_update_icon_color": "--panel-banner-item-update-supported-bgcolor",
"appmenu_info_icon_color": "--panel-banner-item-info-icon-bgcolor",
"tab_icon_overlay_stroke": "--tab-icon-overlay-stroke",
- "tab_icon_overlay_fill": "--tab-icon-overlay-fill"
+ "tab_icon_overlay_fill": "--tab-icon-overlay-fill",
+ "zen_main_browser_background": "--zen-main-browser-background"
},
"properties": {
"panel_hover": "--panel-item-hover-bgcolor",

View File

@@ -1,4 +1,22 @@
#navigator-toolbox toolbar#TabsToolbar {
margin: 5px 0.5%;
}
}
#PersonalToolbar {
/*border-top: 1px solid light-dark(#ddd, #4a4a4a);*/
padding: 5px 0;
padding-inline: 15px !important;
}
#urlbar {
border: 1px solid light-dark(#ddd, #4a4a4a);
border-radius: 5px;
padding: 1px 1px;
}
#zen-website-and-native-separator {
background: light-dark(#ddd, #4a4a4a);
height: 1px;
width: 100%;
}

View File

@@ -1,17 +1,15 @@
html#main-window > body {
--zen-main-browser-background: rgb(229, 229, 229);
}
@media (prefers-color-scheme: dark) {
html#main-window > body {
--zen-main-browser-background: rgb(53, 52, 61);
}
:root {
--zen-main-browser-background: linear-gradient(135deg, rgb(254, 181, 188) 0%, rgb(115, 99, 207) 100%);
}
html#main-window > body > toolbox#navigator-toolbox,
hbox#browser {
background-color: var(--zen-main-browser-background) !important;
background: transparent !important;
}
html#main-window > body {
background: var(--zen-main-browser-background) !important;
}
#appcontent {

View File

@@ -1,10 +1,12 @@
diff --git a/toolkit/themes/shared/desktop-jar.inc.mn b/toolkit/themes/shared/desktop-jar.inc.mn
index 6f504132c2459a0a476a7a440beef6794d52097e..a66f430a0460f131f790d265ca401a8c5681bea1 100644
index 6f504132c2459a0a476a7a440beef6794d52097e..8ca4e84048f4dc04f385f827a8053a636fdbbe22 100644
--- a/toolkit/themes/shared/desktop-jar.inc.mn
+++ b/toolkit/themes/shared/desktop-jar.inc.mn
@@ -151,3 +151,5 @@
@@ -151,3 +151,7 @@
skin/classic/global/reader/RM-Content-Width-Plus-44x16.svg (../../shared/reader/RM-Content-Width-Plus-44x16.svg)
skin/classic/global/reader/RM-Line-Height-Minus-38x14.svg (../../shared/reader/RM-Line-Height-Minus-38x14.svg)
skin/classic/global/reader/RM-Line-Height-Plus-38x24.svg (../../shared/reader/RM-Line-Height-Plus-38x24.svg)
+
+ skin/classic/global/in-content/zen-common-shared.css (../../shared/in-content/zen-common-shared.css)
+ skin/classic/global/zen-global-shared.css (../../shared/zen-global-shared.css)
+ skin/classic/global/zen-popup.css (../../shared/zen-popup.css)

View File

@@ -1,8 +1,17 @@
diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css
index ddc41a66ed0e3688ce34052652bef1fe33a08d49..e0034fb0306b0325b73875d6e2798006bc957d03 100644
index ddc41a66ed0e3688ce34052652bef1fe33a08d49..0a160f129b64c5c8c663d9fefc284c5546a44faf 100644
--- a/toolkit/themes/shared/popup.css
+++ b/toolkit/themes/shared/popup.css
@@ -13,12 +13,12 @@ panel {
@@ -2,6 +2,8 @@
* 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/. */
+@import url("zen-popup.css");
+
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: menupopup ::::: */
@@ -13,12 +15,12 @@ panel {
color-scheme: light dark;
min-width: 1px;
@@ -17,7 +26,7 @@ index ddc41a66ed0e3688ce34052652bef1fe33a08d49..e0034fb0306b0325b73875d6e2798006
--panel-width: initial;
--panel-shadow-margin: 0px;
@@ -30,31 +30,22 @@ panel {
@@ -30,31 +32,22 @@ panel {
--color-canvas: var(--panel-background);
@media (-moz-platform: linux) {
@@ -54,12 +63,3 @@ index ddc41a66ed0e3688ce34052652bef1fe33a08d49..e0034fb0306b0325b73875d6e2798006
&::part(content) {
display: flex;
@@ -64,7 +55,7 @@ panel {
color: var(--panel-color);
background: var(--panel-background);
border-radius: var(--panel-border-radius);
- border: 1px solid var(--panel-border-color);
+ border: 2px solid var(--panel-border-color);
width: var(--panel-width);
box-shadow: var(--panel-shadow);
margin: var(--panel-shadow-margin);

View File

@@ -2,7 +2,7 @@
:root {
--zen-dialog-background: Field;
--zen-dialog-border-color: rgb(184, 184, 184);
--zen-panel-radius: 10px;
--zen-panel-radius: 7px;
--arrowpanel-background: var(--zen-dialog-background) !important;
--arrowpanel-border-color: var(--zen-dialog-border-color) !important;

View File

@@ -0,0 +1,250 @@
:root {
--panel-subview-body-padding: 2px 0 !important;
--arrowpanel-border-radius: 8px !important;
--arrowpanel-menuitem-border-radius: 4px !important;
--arrowpanel-menuitem-margin: var(--uc-arrowpanel-menuitem-margin-block) var(--uc-arrowpanel-menuitem-margin-inline) !important;
--arrowpanel-menuitem-padding-block: 6px !important;
--arrowpanel-menuitem-padding-inline: 10px !important;
--uc-arrowpanel-menuicon-margin-inline: 14px;
--uc-arrowpanel-menuitem-margin-inline: 4px;
--uc-arrowpanel-menuitem-margin-block: 2px;
--panel-separator-margin-vertical: 2px !important;
--panel-separator-margin-horizontal: 0 !important;
--uc-panel-zoom-button-padding: 8px;
--uc-panel-zoom-button-inline-padding: 9px;
--uc-panel-zoom-padding-block: calc(var(--panel-separator-margin-vertical) + var(--uc-arrowpanel-menuitem-margin-block));
--uc-autocomplete-panel-menuitem-margin: 4px;
--uc-autocomplete-panel-menuicon-padding-inline: 14px;
--uc-autocomplete-panel-separator-margin-vertical: 4px;
--uc-permission-itemcontainer-padding-block: 8px;
--uc-permission-item-margin-block: 4px;
--uc-permission-item-padding-inline: 16px;
--uc-contextmenu-border-radius: 8px;
--uc-contextmenu-padding: calc(4px - var(--uc-contextmenu-menuitem-border-width)) 0;
--uc-contextmenu-menuitem-border-radius: calc(4px + var(--uc-contextmenu-menuitem-border-width));
--uc-contextmenu-menuitem-padding-block: 6px;
--uc-contextmenu-menuitem-padding-inline: 10px;
--uc-contextmenu-menuitem-border-width: 2px;
--uc-contextmenu-menuicon-margin-inline: 12px;
--uc-contextmenu-menuitem-margin-inline: calc(4px - var(--uc-contextmenu-menuitem-border-width));
--uc-contextmenu-menuitem-margin-block: 0px;
--uc-contextmenu-menuitem-margin: var(--uc-contextmenu-menuitem-margin-block) var(--uc-contextmenu-menuitem-margin-inline);
--uc-contextmenu-separator-vertical: calc(4px - var(--uc-contextmenu-menuitem-border-width));
--uc-contextmenu-separator-horizontal: 0;
}
/* app menu */
.addon-banner-item,
.panel-banner-item {
margin: 2px 4px 2px !important;
padding-inline: 4px 12px !important;
padding-block: var(--arrowpanel-menuitem-padding-block) !important;
border-radius: var(--arrowpanel-menuitem-border-radius) !important;
}
#appMenu-fxa-label2 label,
#PanelUI-fxa-menu-syncnow-button label {
margin-block: 0 !important;
}
.widget-overflow-list .toolbarbutton-1:not(.toolbarbutton-combined)>.toolbarbutton-text,
.subviewbutton:not(#appMenu-zoom-controls > .subviewbutton)>.toolbarbutton-icon+.toolbarbutton-text,
#appMenu-fxa-label2>vbox {
padding-inline-start: var(--uc-arrowpanel-menuicon-margin-inline) !important;
}
/* special case menuitems with no icons */
#appMenu-zoom-controls>.toolbarbutton-text,
#fxa-manage-account-button>vbox,
#PanelUI-fxa-menu-syncnow-button>hbox {
padding-inline-start: calc(16px + var(--uc-arrowpanel-menuicon-margin-inline)) !important;
}
.subviewbutton>.toolbarbutton-icon {
width: 16px !important;
}
/* firefox profile avatar in appmenu */
#appMenu-fxa-label2::before {
content: "";
display: -moz-box;
height: 16px;
width: 16px;
background: var(--avatar-image-url) 0/16px;
scale: 1.25;
border-radius: 99px;
}
/* disable proton account separator */
#appMenu-fxa-separator {
border-image: none !important;
}
#appMenu-fxa-status2:not([fxastatus]) {
padding-block: 0 !important;
}
#appMenu-fxa-status2:not([fxastatus])>#appMenu-fxa-label2 {
margin-inline-end: calc(var(--arrowpanel-menuitem-padding-inline) * -1) !important;
}
/* zoom controls */
#appMenu-zoom-controls {
border-top: 1px solid var(--panel-separator-color) !important;
padding-inline: calc(var(--arrowpanel-menuitem-padding-inline) + var(--uc-arrowpanel-menuitem-margin-inline)) var(--uc-arrowpanel-menuitem-margin-inline) !important;
padding-block: var(--uc-panel-zoom-padding-block) !important;
margin: var(--panel-separator-margin-vertical) 0 calc(var(--panel-separator-margin-vertical) * -1) !important;
}
#appMenu-zoom-controls>.subviewbutton {
padding: var(--uc-panel-zoom-button-padding) var(--uc-panel-zoom-button-inline-padding) !important;
margin: 0 !important;
}
#appMenu-zoom-controls>#appMenu-zoomReset-button2 {
padding: var(--uc-panel-zoom-button-padding) calc(var(--uc-panel-zoom-button-padding) / 2) !important;
}
/* #appMenu-zoomReduce-button2, */
#appMenu-zoom-controls>#appMenu-fullscreen-button2 {
margin-left: calc((var(--panel-separator-margin-vertical) + var(--uc-arrowpanel-menuitem-margin-block)) * 2 + 1px) !important;
}
#appMenu-zoom-controls>#appMenu-fullscreen-button2::before {
content: "";
border-inline-start: 1px solid var(--panel-separator-color);
display: block;
position: relative;
height: 32px;
margin-block: calc(var(--uc-panel-zoom-button-padding) * -1);
transform: translateX(calc(var(--uc-panel-zoom-button-inline-padding) * -1 - (var(--panel-separator-margin-vertical) + var(--uc-arrowpanel-menuitem-margin-block)) - 1px));
}
#appMenu-zoomReset-button2 {
height: calc(16px + var(--uc-panel-zoom-button-padding) * 2) !important;
min-height: calc(16px + var(--uc-panel-zoom-button-padding) * 2) !important;
}
#appMenu-zoomReduce-button2:not([disabled], [open], :active):is(:hover),
#appMenu-zoomEnlarge-button2:not([disabled], [open], :active):is(:hover),
#appMenu-fullscreen-button2:not([disabled], [open], :active):is(:hover),
#appMenu-zoomReset-button2:not([disabled], [open], :active):is(:hover) {
background-color: var(--panel-item-hover-bgcolor) !important;
}
#appMenu-zoomReduce-button2:not([disabled]):is([open], :hover:active),
#appMenu-zoomEnlarge-button2:not([disabled]):is([open], :hover:active),
#appMenu-fullscreen-button2:not([disabled]):is([open], :hover:active),
#appMenu-zoomReset-button2:not([disabled]):is([open], :hover:active) {
background-color: var(--panel-item-active-bgcolor) !important;
}
#appMenu-zoomReset-button2>.toolbarbutton-text,
#appMenu-fullscreen-button2>.toolbarbutton-icon {
background-color: transparent !important;
padding: 0 !important;
}
.subviewbutton[shortcut]::after {
opacity: 0.7 !important;
}
#widget-overflow-mainView .panel-subview-body {
padding-bottom: 0 !important;
}
.PanelUI-subView>.panel-header+toolbarseparator {
margin-bottom: 0 !important;
}
.PanelUI-subView>.panel-header+toolbarseparator+.panel-subview-body {
padding-top: var(--panel-separator-margin-vertical) !important;
}
#identity-popup-security-button {
margin-bottom: var(--panel-separator-margin-vertical) !important;
}
#permission-popup-mainView-panel-header,
#identity-popup-mainView-panel-header,
#protections-popup-mainView-panel-header,
.panel-header {
min-height: calc((var(--arrowpanel-menuitem-padding-block) + 4px) * 2 + 16px) !important;
}
/* URL bar popup */
.panel-footer>button {
border-radius: 2px !important;
}
.identity-popup-security-connection>hbox>description {
margin-inline-start: 0 !important;
}
.identity-popup-security-connection.identity-button {
margin-inline-end: calc(-1 * (var(--arrowpanel-menuitem-padding-inline) - 10px)) !important;
}
#identity-popup-mainView-panel-header-span,
#permission-popup-mainView-panel-header-span,
#identity-popup-mainView-panel-header label,
#permission-popup-mainView-panel-header label,
#protections-popup-mainView-panel-header-span {
margin-block: 0 !important;
}
.permission-popup-section {
padding-block: var(--uc-permission-itemcontainer-padding-block) !important;
}
#permission-popup-permissions-content {
padding-inline: var(--uc-permission-item-padding-inline) !important;
}
.permission-popup-permission-item,
#permission-popup-storage-access-permission-list-header {
margin-block: var(--uc-permission-item-margin-block) !important;
}
.permission-popup-permission-label,
.permission-popup-permission-header-label {
margin-inline-start: var(--uc-arrowpanel-menuicon-margin-inline) !important;
}
#editBookmarkPanel>#editBookmarkHeaderSeparator,
#editBookmarkPanel>.panel-subview-body>#editBookmarkSeparator {
margin-inline: 0 !important;
}
/* subview */
.panel-header {
padding: 4px !important;
padding-top: 4px !important;
}
.panel-header+toolbarseparator,
#identity-popup-mainView-panel-header+toolbarseparator,
#permission-popup-mainView-panel-header+toolbarseparator,
#protections-popup-mainView-panel-header-section+toolbarseparator {
margin-block-start: 0 !important;
}
.panel-header>.subviewbutton-back {
margin: 0 !important;
padding: var(--arrowpanel-menuitem-padding-block) !important;
}
.panel-subview-footer-button {
margin-bottom: 4px !important;
}
.webextension-popup-browser,
.webextension-popup-stack {
margin-block-start: calc(var(--panel-separator-margin-vertical) * -.5) !important;
}