mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-10-04 17:06:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update version to 127.0.1!

Browse Source
This commit is contained in:
Mauro Balades
2024-07-02 10:00:24 +02:00
parent 753fbe26b0
commit 8a41bcf390
15 changed files with 134 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gluon.json
View File

@@ -5,7 +5,7 @@
"binaryName": "zen", "binaryName": "zen",
"version": { "version": {
"product": "firefox", "product": "firefox",
"version": "126.0", "version": "127.0.1",
"displayVersion": "1.0.0" "displayVersion": "1.0.0"
}, },
"buildOptions": { "buildOptions": {

8
src/browser/app/profile/firefox-js.patch
View File

@@ -1,10 +1,10 @@
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 8c4b0e28e53f3f0e0e492dd8f351535a5604af73..968c8792f4a2358da3f89cabfa179585bfbf0874 100644 index 27c2d13fbd8599a131de6b70bba581d435198793..25aa7546d57e206b76838bc23b609f602af43a83 100644
--- a/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js
@@ -3038,3 +3038,5 @@ pref("startup.homepage_override_nimbus_maxVersion", ""); @@ -3061,3 +3061,5 @@ pref("startup.homepage_override_nimbus_maxVersion", "");
// Pref to enable the content relevancy feature.
pref("toolkit.contentRelevancy.enabled", false); pref("toolkit.contentRelevancy.enabled", false);
// Pref to enable the ingestion through the Rust component.
pref("toolkit.contentRelevancy.ingestEnabled", false);
+ +
+#include zen-browser.js +#include zen-browser.js

40
src/browser/base/content/browser-box-inc-xhtml.patch
View File

@@ -1,41 +1,23 @@
diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
index 41258d81bbd2549a2d80cb7df9a9d65aa73a46f1..75bb0897710a478257d38c55c7fb0efb5aedd777 100644 index b0308911446dd6fc549401371a85faa6341f8338..3942a0b45308b110685c34e8a9367d7c5d40d8c4 100644
--- a/browser/base/content/browser-box.inc.xhtml --- a/browser/base/content/browser-box.inc.xhtml
+++ b/browser/base/content/browser-box.inc.xhtml +++ b/browser/base/content/browser-box.inc.xhtml
@@ -2,28 +2,17 @@ @@ -18,12 +18,18 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this <browser id="sidebar" autoscroll="false" disablehistory="true" disablefullscreen="true" tooltip="aHTMLTooltip"/>
# file, You can obtain one at http://mozilla.org/MPL/2.0/. </vbox>
<splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
-<hbox flex="1" id="browser"> + <vbox id="browser">
- <html:sidebar-launcher id="sidebar-launcher" flex="1" hidden="true"></html:sidebar-launcher>
- <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
- <box id="sidebar-header" align="center">
- <toolbarbutton id="sidebar-switcher-target" class="tabbable" aria-expanded="false">
- <image id="sidebar-icon" consumeanchor="sidebar-switcher-target"/>
- <label id="sidebar-title" crop="end" control="sidebar"/>
- <image id="sidebar-switcher-arrow"/>
- </toolbarbutton>
- <image id="sidebar-throbber"/>
- <spacer id="sidebar-spacer"/>
- <toolbarbutton id="sidebar-close" class="close-icon tabbable" data-l10n-id="sidebar-close-button" oncommand="SidebarUI.hide();"/>
- </box>
- <browser id="sidebar" autoscroll="false" disablehistory="true" disablefullscreen="true" tooltip="aHTMLTooltip"/>
- </vbox>
- <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
+<vbox id="browser">
<vbox id="appcontent" flex="1"> <vbox id="appcontent" flex="1">
+ <html:div id="zen-appcontent-navbar-container"></html:div> + <html:div id="zen-appcontent-navbar-container"></html:div>
<!-- gNotificationBox will be added here lazily. --> <!-- gNotificationBox will be added here lazily. -->
- <tabbox id="tabbrowser-tabbox"
+ <hbox id="zen-tabbox-wrapper" flex="1"> + <hbox id="zen-tabbox-wrapper" flex="1">
+ <tabbox id="tabbrowser-tabbox" <tabbox id="tabbrowser-tabbox"
flex="1" tabcontainer="tabbrowser-tabs"> flex="1" tabcontainer="tabbrowser-tabs">
+#include zen-sidebar-panel.inc.xhtml +#include zen-sidebar-panel.inc.xhtml
<tabpanels id="tabbrowser-tabpanels" <tabpanels id="tabbrowser-tabpanels"
flex="1" selectedIndex="0"/> flex="1" selectedIndex="0"/>
- </tabbox> </tabbox>
+ </tabbox> + </hbox>
+ </hbox> + </vbox>
</vbox> </vbox>
-</hbox> </hbox>
+</vbox>

33
src/browser/base/content/browser-init-js.patch Normal file
View File

@@ -0,0 +1,33 @@
diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
index 0717ce21386b73fc3399c97b34c6892a674cca77..f20e8a43fdd1d885f917948a26f1c3a1bd917707 100644
--- a/browser/base/content/browser-init.js
+++ b/browser/base/content/browser-init.js
@@ -230,6 +230,12 @@ var gBrowserInit = {
gURLBar.readOnly = true;
}
+ Services.scriptloader.loadSubScript("chrome://browser/content/zenThemeModifier.js", this);
+
+ // ZEN: Propagate the current profile used to the browser UI, such as
+ // showing the avatar and profile info to the side bar
+ zenUpdateBrowserProfiles();
+
// Misc. inits.
gUIDensity.init();
TabletModeUpdater.init();
@@ -1105,3 +1111,15 @@ var gBrowserInit = {
};
gBrowserInit.idleTasksFinishedPromise = gBrowserInit.idleTasksFinished.promise;
+
+function zenUpdateBrowserProfiles() {
+ const mainWindowEl = document.documentElement;
+ // Dont override the sync avatar if it's already set
+ if (mainWindowEl.style.hasOwnProperty("--avatar-image-url")) {
+ return;
+ }
+ let profile = ProfileService.currentProfile;
+ if (!profile || profile.zenAvatarPath == "") return;
+ // TODO: actually use profile data to generate the avatar, instead of just using the name
+ mainWindowEl.style.setProperty("--avatar-image-url", `url(${profile.zenAvatarPath})`);
+}

79
src/browser/base/content/browser-js.patch
View File

@@ -1,10 +1,10 @@
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 72753da622ec51d8be130a49e98a62f483d7f8db..424a8778b581af0c67cfd1c01a65fceec2bf24fb 100644 index 5f41ca778131eedfd32043dc27d6528be978c4fb..086b01e8fdf80dd333d80b9eede190cdb5315b70 100644
--- a/browser/base/content/browser.js --- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js +++ b/browser/base/content/browser.js
@@ -13,6 +13,15 @@ ChromeUtils.importESModule("resource://gre/modules/NotificationDB.sys.mjs"); @@ -630,6 +630,15 @@ XPCOMUtils.defineLazyPreferenceGetter(
false
// lazy module getters );
+const ZEN_WELCOME_PATH = "zen-welcome"; +const ZEN_WELCOME_PATH = "zen-welcome";
+const ZEN_WELCOME_ELEMENT_ATTR = "zen-dialog-welcome-element"; +const ZEN_WELCOME_ELEMENT_ATTR = "zen-dialog-welcome-element";
@@ -15,39 +15,19 @@ index 72753da622ec51d8be130a49e98a62f483d7f8db..424a8778b581af0c67cfd1c01a65fcee
+ "nsIToolkitProfileService" + "nsIToolkitProfileService"
+); +);
+ +
ChromeUtils.defineESModuleGetters(this, { customElements.setElementCreationCallback("screenshots-buttons", () => {
AMTelemetry: "resource://gre/modules/AddonManager.sys.mjs", Services.scriptloader.loadSubScript(
AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs", "chrome://browser/content/screenshots/screenshots-buttons.js",
@@ -1668,6 +1677,7 @@ var gBrowserInit = { @@ -3668,6 +3677,8 @@ var XULBrowserWindow = {
}); AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
updateFxaToolbarMenu(gFxaToolbarEnabled, true);
+ Services.scriptloader.loadSubScript("chrome://browser/content/zenThemeModifier.js", this);
updatePrintCommands(gPrintEnabled);
@@ -1731,6 +1741,11 @@ var gBrowserInit = {
}
// Misc. inits.
+
+ // ZEN: Propagate the current profile used to the browser UI, such as
+ // showing the avatar and profile info to the side bar
+ zenUpdateBrowserProfiles();
+
gUIDensity.init();
TabletModeUpdater.init();
CombinedStopReload.ensureInitialized();
@@ -4821,6 +4836,8 @@ var XULBrowserWindow = {
}
}
}
+
+ gZenViewSplitter.onLocationChange(gBrowser.selectedBrowser); + gZenViewSplitter.onLocationChange(gBrowser.selectedBrowser);
}, +
PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
_updateElementsForContentType() { if (!gMultiProcessBrowser) {
@@ -6099,7 +6116,7 @@ function setToolbarVisibility( @@ -4982,7 +4993,7 @@ function setToolbarVisibility(
); );
} }
@@ -56,33 +36,16 @@ index 72753da622ec51d8be130a49e98a62f483d7f8db..424a8778b581af0c67cfd1c01a65fcee
switch (isVisible) { switch (isVisible) {
case true: case true:
case "always": case "always":
@@ -9007,6 +9024,13 @@ var gDialogBox = { @@ -7813,6 +7824,12 @@ var gDialogBox = {
parentElement.style.removeProperty("width"); parentElement.showModal();
parentElement.style.removeProperty("height"); this._didOpenHTMLDialog = true;
document.documentElement.setAttribute("window-modal-open", true);
+
+ if (uri.includes(ZEN_WELCOME_PATH)) { + if (uri.includes(ZEN_WELCOME_PATH)) {
+ parentElement.setAttribute(ZEN_WELCOME_ELEMENT_ATTR, true); + parentElement.setAttribute(ZEN_WELCOME_ELEMENT_ATTR, true);
+ } else if (parentElement.hasAttribute(ZEN_WELCOME_ELEMENT_ATTR)) { + } else if (parentElement.hasAttribute(ZEN_WELCOME_ELEMENT_ATTR)) {
+ parentElement.removeAttribute(ZEN_WELCOME_ELEMENT_ATTR); + parentElement.removeAttribute(ZEN_WELCOME_ELEMENT_ATTR);
+ } + }
+ +
// Call this first so the contents show up and get layout, which is // Disable menus and shortcuts.
// required for SubDialog to work. this._updateMenuAndCommandState(false /* to disable */);
parentElement.showModal();
@@ -9384,3 +9408,15 @@ var FirefoxViewHandler = {
this.button?.toggleAttribute("attention", shouldShow);
},
};
+
+function zenUpdateBrowserProfiles() {
+ const mainWindowEl = document.documentElement;
+ // Dont override the sync avatar if it's already set
+ if (mainWindowEl.style.hasOwnProperty("--avatar-image-url")) {
+ return;
+ }
+ let profile = ProfileService.currentProfile;
+ if (!profile || profile.zenAvatarPath == "") return;
+ // TODO: actually use profile data to generate the avatar, instead of just using the name
+ mainWindowEl.style.setProperty("--avatar-image-url", `url(${profile.zenAvatarPath})`);
+}

16
src/browser/base/content/main-popupset-inc-xhtml.patch
View File

@@ -1,11 +1,11 @@
diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
index 91b2483c53fe67875d108a3d7c1959411f1d2c8f..1c3f460392a9c6ad4329865f3bf5dd253d84895d 100644 index ef8245938ea669227c255d85422a26b99cb2290b..48c061796072e976a45f7bd0ca1c8b3913728fc7 100644
--- a/browser/base/content/main-popupset.inc.xhtml --- a/browser/base/content/main-popupset.inc.xhtml
+++ b/browser/base/content/main-popupset.inc.xhtml +++ b/browser/base/content/main-popupset.inc.xhtml
@@ -77,6 +77,12 @@ @@ -80,6 +80,12 @@
data-lazy-l10n-id="tab-context-close-n-tabs" <menuitem id="context_closeDuplicateTabs"
data-l10n-args='{"tabCount": 1}' data-lazy-l10n-id="tab-context-close-duplicate-tabs"
oncommand="TabContextMenu.closeContextTabs();"/> oncommand="gBrowser.removeDuplicateTabs(TabContextMenu.contextTab);"/>
+ <menuseparator/> + <menuseparator/>
+ <menuitem id="context_zenSplitTabs" + <menuitem id="context_zenSplitTabs"
+ data-lazy-l10n-id="tab-zen-split-tabs" + data-lazy-l10n-id="tab-zen-split-tabs"
@@ -15,7 +15,7 @@ index 91b2483c53fe67875d108a3d7c1959411f1d2c8f..1c3f460392a9c6ad4329865f3bf5dd25
<menu id="context_closeTabOptions" <menu id="context_closeTabOptions"
data-lazy-l10n-id="tab-context-close-multiple-tabs"> data-lazy-l10n-id="tab-context-close-multiple-tabs">
<menupopup id="closeTabOptions"> <menupopup id="closeTabOptions">
@@ -166,6 +172,10 @@ @@ -169,6 +175,10 @@
hidden="true" hidden="true"
tabspecific="true" tabspecific="true"
aria-labelledby="editBookmarkPanelTitle"> aria-labelledby="editBookmarkPanelTitle">
@@ -26,7 +26,7 @@ index 91b2483c53fe67875d108a3d7c1959411f1d2c8f..1c3f460392a9c6ad4329865f3bf5dd25
<box class="panel-header"> <box class="panel-header">
<html:h1> <html:h1>
<html:span id="editBookmarkPanelTitle"/> <html:span id="editBookmarkPanelTitle"/>
@@ -188,12 +198,14 @@ @@ -191,12 +201,14 @@
class="footer-button" class="footer-button"
data-l10n-id="bookmark-panel-save-button" data-l10n-id="bookmark-panel-save-button"
default="true" default="true"
@@ -41,7 +41,7 @@ index 91b2483c53fe67875d108a3d7c1959411f1d2c8f..1c3f460392a9c6ad4329865f3bf5dd25
</panel> </panel>
</html:template> </html:template>
@@ -507,6 +519,8 @@ @@ -514,6 +526,8 @@
#include popup-notifications.inc #include popup-notifications.inc

43
src/browser/base/content/navigator-toolbox-inc-xhtml.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
index fc19910726f2925505f6e71add034c82af36b63e..90a4686992832cad8656f4c9978ff460d20eb053 100644 index 0a67afa81ff5e10dcbfb53149f7ed9109de084ac..eb31df1dc273e1e71a1317e765efe49099a3dd4a 100644
--- a/browser/base/content/navigator-toolbox.inc.xhtml --- a/browser/base/content/navigator-toolbox.inc.xhtml
+++ b/browser/base/content/navigator-toolbox.inc.xhtml +++ b/browser/base/content/navigator-toolbox.inc.xhtml
@@ -32,10 +32,11 @@ @@ -32,10 +32,11 @@
@@ -11,11 +11,11 @@ index fc19910726f2925505f6e71add034c82af36b63e..90a4686992832cad8656f4c9978ff460
<toolbartabstop/> <toolbartabstop/>
<hbox id="TabsToolbar-customization-target" flex="1"> <hbox id="TabsToolbar-customization-target" flex="1">
<toolbarbutton id="firefox-view-button" <toolbarbutton id="firefox-view-button"
+ hidden="true" + hidden="true"
class="toolbarbutton-1 chromeclass-toolbar-additional" class="toolbarbutton-1 chromeclass-toolbar-additional"
data-l10n-id="toolbar-button-firefox-view-2" data-l10n-id="toolbar-button-firefox-view-2"
role="button" role="button"
@@ -50,21 +51,24 @@ @@ -50,13 +51,14 @@
aria-multiselectable="true" aria-multiselectable="true"
setfocus="false" setfocus="false"
tooltip="tabbrowser-tab-tooltip" tooltip="tabbrowser-tab-tooltip"
@@ -31,30 +31,20 @@ index fc19910726f2925505f6e71add034c82af36b63e..90a4686992832cad8656f4c9978ff460
<tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/> <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
<hbox id="tabbrowser-arrowscrollbox-periphery"> <hbox id="tabbrowser-arrowscrollbox-periphery">
<toolbartabstop/> <toolbartabstop/>
+ @@ -103,9 +105,10 @@
<toolbarbutton id="tabs-newtab-button" <toolbarbutton id="content-analysis-indicator"
class="toolbarbutton-1" oncommand="ContentAnalysis.showPanel(this, PanelUI);"
command="cmd_newNavigatorTab" class="toolbarbutton-1 content-analysis-indicator-icon"/>
onclick="gBrowser.handleNewTabMiddleClick(this, event);" -
tooltip="dynamic-shortcut-tooltip"/> + #if 0
+
<spacer class="closing-tabs-spacer" style="width: 0;"/>
</hbox>
</arrowscrollbox>
@@ -101,8 +105,11 @@
<label data-l10n-id="private-browsing-indicator-label"></label>
</hbox>
+#if 0
#include titlebar-items.inc.xhtml #include titlebar-items.inc.xhtml
- -
+#endif +#endif
+#include zen-sidebar-icons.inc.xhtml +#include zen-sidebar-icons.inc.xhtml
+
</toolbar> </toolbar>
</vbox> </vbox>
@@ -447,6 +454,7 @@ @@ -450,6 +453,7 @@
<toolbarbutton id="fxa-toolbar-menu-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav" <toolbarbutton id="fxa-toolbar-menu-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
badged="true" badged="true"
@@ -62,21 +52,12 @@ index fc19910726f2925505f6e71add034c82af36b63e..90a4686992832cad8656f4c9978ff460
delegatesanchor="true" delegatesanchor="true"
onmousedown="gSync.toggleAccountPanel(this, event)" onmousedown="gSync.toggleAccountPanel(this, event)"
onkeypress="gSync.toggleAccountPanel(this, event)" onkeypress="gSync.toggleAccountPanel(this, event)"
@@ -505,6 +513,9 @@ @@ -501,6 +505,8 @@
consumeanchor="PanelUI-button" consumeanchor="PanelUI-button"
data-l10n-id="appmenu-menu-button-closed2"/> data-l10n-id="appmenu-menu-button-closed2"/>
</toolbaritem> </toolbaritem>
+ +
+#include titlebar-items.inc.xhtml + #include titlebar-items.inc.xhtml
+
</toolbar> </toolbar>
<toolbar id="PersonalToolbar" <toolbar id="PersonalToolbar"
@@ -576,7 +587,6 @@
<html:named-deck id="tab-notification-deck"></html:named-deck>
</html:template>
-
<html:template id="BrowserToolbarPalette">
<toolbarbutton id="import-button"
class="toolbarbutton-1 chromeclass-toolbar-additional"

6
src/browser/components/sidebar/browser-sidebar-js.patch
View File

@@ -1,11 +1,11 @@
diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
index 55664f8cfc8ff7071e5d93fbf24b7471cfc4f879..398e78600e50bc1e2a8dbb2d64d6b578f4def28f 100644 index 6cbac7c0826856adfcdafd3507e05f3efac95a2d..966289f04246deefe3dcb233f7fcb755fccfdbc6 100644
--- a/browser/components/sidebar/browser-sidebar.js --- a/browser/components/sidebar/browser-sidebar.js
+++ b/browser/components/sidebar/browser-sidebar.js +++ b/browser/components/sidebar/browser-sidebar.js
@@ -357,6 +357,7 @@ var SidebarUI = { @@ -404,6 +404,7 @@ var SidebarController = {
} else { } else {
this._box.removeAttribute("positionend"); this._box.removeAttribute("positionend");
sidebarLauncher.removeAttribute("positionend"); sidebarMain.removeAttribute("positionend");
+ this._box.style.order = 0; + this._box.style.order = 0;
} }

2
src/browser/components/zen-welcome/welcome.css
View File

@@ -207,7 +207,7 @@ input[type='checkbox'] {
border-radius: 99px; border-radius: 99px;
height: 20px; height: 20px;
display: flex; display: flex;
border: 2px solid var(--arrowpanel-border-color); border: 1px solid var(--zen-colors-primary) !important;
} }
#dragBall { #dragBall {

9
src/browser/themes/addons/light/manifest-json.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/themes/addons/light/manifest.json b/browser/themes/addons/light/manifest.json diff --git a/browser/themes/addons/light/manifest.json b/browser/themes/addons/light/manifest.json
index 7385970fa8e3ff9659b72cfb238003958220fb0d..9c069db212d73769526ce9bf0fc6d62ab5881a5d 100644 index 7385970fa8e3ff9659b72cfb238003958220fb0d..be4d385cf4520a2cad437225e5fb31335bbc3091 100644
--- a/browser/themes/addons/light/manifest.json --- a/browser/themes/addons/light/manifest.json
+++ b/browser/themes/addons/light/manifest.json +++ b/browser/themes/addons/light/manifest.json
@@ -7,10 +7,10 @@ @@ -7,10 +7,10 @@
@@ -34,7 +34,12 @@ index 7385970fa8e3ff9659b72cfb238003958220fb0d..9c069db212d73769526ce9bf0fc6d62a
"urlbar_popup_hover": "rgb(240,240,244)", "urlbar_popup_hover": "rgb(240,240,244)",
"urlbar_popup_separator": "rgb(240,240,244)", "urlbar_popup_separator": "rgb(240,240,244)",
"appmenu_update_icon_color": "#2AC3A2", "appmenu_update_icon_color": "#2AC3A2",
@@ -61,8 +61,9 @@ @@ -57,12 +57,13 @@
},
"properties": {
"color_scheme": "light",
- "panel_hover": "color-mix(in srgb, currentColor 12%, transparent)",
+ "panel_hover": "color-mix(in srgb, currentColor 10%, transparent)",
"panel_active": "color-mix(in srgb, currentColor 20%, transparent)", "panel_active": "color-mix(in srgb, currentColor 20%, transparent)",
"panel_active_darker": "color-mix(in srgb, currentColor 27%, transparent)", "panel_active_darker": "color-mix(in srgb, currentColor 27%, transparent)",
"toolbar_field_icon_opacity": "0.72", "toolbar_field_icon_opacity": "0.72",

11
src/browser/themes/shared/browser-custom-colors-css.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/themes/shared/browser-custom-colors.css b/browser/themes/shared/browser-custom-colors.css diff --git a/browser/themes/shared/browser-custom-colors.css b/browser/themes/shared/browser-custom-colors.css
index 23187312740d440b3cd4b376a06cb2ab2e885604..3f16966196887609b7e734f194c346d9cc9fda4b 100644 index 23187312740d440b3cd4b376a06cb2ab2e885604..ac9aafc0ceed04364ae5b468cf7d2b2843aa7fe5 100644
--- a/browser/themes/shared/browser-custom-colors.css --- a/browser/themes/shared/browser-custom-colors.css
+++ b/browser/themes/shared/browser-custom-colors.css +++ b/browser/themes/shared/browser-custom-colors.css
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
@@ -11,6 +11,15 @@ index 23187312740d440b3cd4b376a06cb2ab2e885604..3f16966196887609b7e734f194c346d9
--button-primary-hover-bgcolor: light-dark(rgb(2, 80, 187), rgb(128, 235, 255)); --button-primary-hover-bgcolor: light-dark(rgb(2, 80, 187), rgb(128, 235, 255));
--button-primary-active-bgcolor: light-dark(rgb(5, 62, 148), rgb(170, 242, 255)); --button-primary-active-bgcolor: light-dark(rgb(5, 62, 148), rgb(170, 242, 255));
--button-primary-color: light-dark(rgb(251, 251, 254), rgb(43, 42, 51)); --button-primary-color: light-dark(rgb(251, 251, 254), rgb(43, 42, 51));
@@ -15,7 +15,7 @@
rgba(0, 0, 0, .33)
);
--button-hover-bgcolor: light-dark(
- rgba(207, 207, 216, .66),
+ rgba(228, 228, 235, 0.66),
rgba(207, 207, 216, .20)
);
--button-active-bgcolor: light-dark(
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
--tab-icon-overlay-fill: light-dark(rgb(91, 91, 102), rgb(251, 251, 254)); --tab-icon-overlay-fill: light-dark(rgb(91, 91, 102), rgb(251, 251, 254));
--tabs-navbar-separator-style: none; --tabs-navbar-separator-style: none;

17
src/browser/themes/shared/browser-shared-css.patch
View File

@@ -1,8 +1,8 @@
diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
index 164b54bd857e5782e3885dcde5663f336de737de..d7cf63c4ac84f00641c4ac9bfa407beb2f027c60 100644 index 9e513830a9d9eeebe55cf6ab565b0575a943b088..05c8b716c0642f0ecebc47fe2759bc43474b6391 100644
--- a/browser/themes/shared/browser-shared.css --- a/browser/themes/shared/browser-shared.css
+++ b/browser/themes/shared/browser-shared.css +++ b/browser/themes/shared/browser-shared.css
@@ -24,6 +24,8 @@ @@ -25,6 +25,8 @@
@import url("chrome://browser/skin/UITour.css"); @import url("chrome://browser/skin/UITour.css");
@import url("chrome://browser/skin/formautofill-notification.css"); @import url("chrome://browser/skin/formautofill-notification.css");
@@ -11,7 +11,16 @@ index 164b54bd857e5782e3885dcde5663f336de737de..d7cf63c4ac84f00641c4ac9bfa407beb
@namespace html url("http://www.w3.org/1999/xhtml"); @namespace html url("http://www.w3.org/1999/xhtml");
:root { :root {
@@ -152,9 +154,6 @@ @@ -49,7 +51,7 @@
--short-notification-gradient: #9059FF;
--button-bgcolor: color-mix(in srgb, currentColor 13%, transparent);
- --button-hover-bgcolor: color-mix(in srgb, currentColor 17%, transparent);
+ --button-hover-bgcolor: color-mix(in srgb, currentColor 15%, transparent);
--button-active-bgcolor: color-mix(in srgb, currentColor 30%, transparent);
--button-color: currentColor;
--button-primary-bgcolor: AccentColor;
@@ -145,9 +147,6 @@
#navigator-toolbox { #navigator-toolbox {
appearance: none; appearance: none;
@@ -21,7 +30,7 @@ index 164b54bd857e5782e3885dcde5663f336de737de..d7cf63c4ac84f00641c4ac9bfa407beb
background-color: var(--toolbox-non-lwt-bgcolor); background-color: var(--toolbox-non-lwt-bgcolor);
color: var(--toolbox-non-lwt-textcolor); color: var(--toolbox-non-lwt-textcolor);
@@ -162,33 +161,8 @@ @@ -155,33 +154,8 @@
transition: background-color var(--inactive-window-transition); transition: background-color var(--inactive-window-transition);
&:-moz-window-inactive { &:-moz-window-inactive {

2
src/browser/themes/shared/zen-panel-ui.css
View File

@@ -8,7 +8,7 @@
#PanelUI-zen-profiles-header { #PanelUI-zen-profiles-header {
width: 280px; width: 280px;
height: 130px; height: 130px;
background: var(--zen-colors-primary-foreground); background: color-mix(in srgb, var(--zen-primary-color) 80%, white 20%);
position: relative; position: relative;
} }

11
src/toolkit/themes/shared/desktop-jar-inc-mn.patch
View File

@@ -1,10 +1,11 @@
diff --git a/toolkit/themes/shared/desktop-jar.inc.mn b/toolkit/themes/shared/desktop-jar.inc.mn diff --git a/toolkit/themes/shared/desktop-jar.inc.mn b/toolkit/themes/shared/desktop-jar.inc.mn
index 6f504132c2459a0a476a7a440beef6794d52097e..627f4f72db90bed03ef135e2ac0ad09e53bb9fef 100644 index 5907a9773fe608520b0088c1fc40c23a7003530f..535a7fae17f295a3bc97cf807d9c9dd496ec2352 100644
--- a/toolkit/themes/shared/desktop-jar.inc.mn --- a/toolkit/themes/shared/desktop-jar.inc.mn
+++ b/toolkit/themes/shared/desktop-jar.inc.mn +++ b/toolkit/themes/shared/desktop-jar.inc.mn
@@ -151,3 +151,5 @@ @@ -162,3 +162,5 @@
skin/classic/global/reader/RM-Content-Width-Plus-44x16.svg (../../shared/reader/RM-Content-Width-Plus-44x16.svg) skin/classic/global/reader/content-width-20.svg (../../shared/reader/content-width-20.svg)
skin/classic/global/reader/RM-Line-Height-Minus-38x14.svg (../../shared/reader/RM-Line-Height-Minus-38x14.svg) skin/classic/global/tree/sort-asc.svg (../../shared/tree/sort-asc.svg)
skin/classic/global/reader/RM-Line-Height-Plus-38x24.svg (../../shared/reader/RM-Line-Height-Plus-38x24.svg) skin/classic/global/tree/sort-dsc.svg (../../shared/tree/sort-dsc.svg)
+ +
+#include zen-desktop.jar.inc.mn +#include zen-desktop.jar.inc.mn
\ No newline at end of file

4
src/toolkit/themes/shared/popup-css.patch
View File

@@ -1,5 +1,5 @@
diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css
index 1426f9c4f6f24f19277006ead43eb88a50a408e5..8f8da0189772e00fb787d6708fce0481e52eaf39 100644 index ed230860215c734e6fb903b3660d0c679043e3f3..a2808bec7fbfff58e3c56219cf2c7703eeb61ec1 100644
--- a/toolkit/themes/shared/popup.css --- a/toolkit/themes/shared/popup.css
+++ b/toolkit/themes/shared/popup.css +++ b/toolkit/themes/shared/popup.css
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
@@ -29,7 +29,7 @@ index 1426f9c4f6f24f19277006ead43eb88a50a408e5..8f8da0189772e00fb787d6708fce0481
--panel-shadow-margin: 0px; --panel-shadow-margin: 0px;
- --panel-shadow: 0 0 var(--panel-shadow-margin) hsla(0,0%,0%,.2); - --panel-shadow: 0 0 var(--panel-shadow-margin) hsla(0,0%,0%,.2);
+ --panel-shadow: rgba(0, 0, 0, 0.15) 0px 4px 10px; + --panel-shadow: rgba(0, 0, 0, 0.05) 0px 4px 10px;
-moz-window-input-region-margin: var(--panel-shadow-margin); -moz-window-input-region-margin: var(--panel-shadow-margin);
margin: calc(-1 * var(--panel-shadow-margin)); margin: calc(-1 * var(--panel-shadow-margin));