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

Updated to firefox 125.0.1!

Browse Source
This commit is contained in:
Mauro Balades
2024-04-17 19:30:10 +02:00
parent 5431fde32f
commit 0469a3db6f
12 changed files with 66 additions and 79 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": "124.0.2", "version": "125.0.1",
"displayVersion": "1.0.0" "displayVersion": "1.0.0"
}, },
"buildOptions": { "buildOptions": {

10
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 5964d40ca3a3654f8fdc62d87deb0ac51c9a55ab..fdaa15ecaff403d61ec6d4f068678b56442dd28a 100644 index 1ef5a05907f4675e4e7191dde12c33dc6da5e3c6..69279a1a1278b7034df24b9763c5722a6c623bbc 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
@@ -3022,3 +3022,5 @@ pref("browser.mailto.dualPrompt.os", false); @@ -3037,3 +3037,5 @@ pref("browser.profiles.enabled", false);
// When visiting a site which uses registerProtocolHandler: Ask the user to set Firefox as
// default mailto handler. pref("startup.homepage_override_url_nimbus", "");
pref("browser.mailto.prompt.os", true); pref("startup.homepage_override_nimbus_maxVersion", "");
+ +
+#include zen-browser.js +#include zen-browser.js

3
src/browser/app/profile/zen-browser.js
View File

@@ -46,6 +46,7 @@ pref('browser.urlbar.unitConversion.enabled', true);
pref('browser.urlbar.trending.featureGate', false); pref('browser.urlbar.trending.featureGate', false);
pref('browser.urlbar.weather.featureGate', true); pref('browser.urlbar.weather.featureGate', true);
pref('browser.urlbar.quickactions.enabled', true); pref('browser.urlbar.quickactions.enabled', true);
pref('browser.urlbar.clipboard.featureGate', true);
// new tab page // new tab page
pref('browser.newtabpage.activity-stream.feeds.topsites', false); pref('browser.newtabpage.activity-stream.feeds.topsites', false);
@@ -133,3 +134,5 @@ pref('dom.enable_web_task_scheduling', true);
pref('layout.css.has-selector.enabled', true); pref('layout.css.has-selector.enabled', true);
pref('dom.security.sanitizer.enabled', true); pref('dom.security.sanitizer.enabled', true);
// Pref to enable the new profiles (TODO: Check this out!)
//pref("browser.profiles.enabled", true);

13
src/browser/components/customizableui/PanelMultiView-sys-mjs.patch
View File

@@ -1,13 +0,0 @@
diff --git a/browser/components/customizableui/PanelMultiView.sys.mjs b/browser/components/customizableui/PanelMultiView.sys.mjs
index a97889f08a61e68ebf5bc5d3749362a40d48bb77..5770b0e86bbe01180c174f5d512133c577c4e0ac 100644
--- a/browser/components/customizableui/PanelMultiView.sys.mjs
+++ b/browser/components/customizableui/PanelMultiView.sys.mjs
@@ -1205,7 +1205,7 @@ export var PanelMultiView = class extends AssociatedToNode {
} else {
let anchorScreenBottom = anchor.screenY + anchorRect.height;
let cssAvailHeight = availHeight.value / screen.defaultCSSScaleFactor;
- maxHeight = cssAvailTop + cssAvailHeight - anchorScreenBottom;
+ maxHeight = cssAvailTop + cssAvailHeight;
}
// To go from the maximum height of the panel to the maximum height of

16
src/browser/components/preferences/preferences-js.patch
View File

@@ -1,12 +1,12 @@
diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
index 31ae84f3820aa12a26e10b27718bdc7da277f31b..427d44698ffe5d8154c5503a415ce9ec98982f3b 100644 index c30a51c67ce636fa889090419a5c2642d74b4f49..b48ab31c564db4a4911c9fca291b4f09ba1025af 100644
--- a/browser/components/preferences/preferences.js --- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js
@@ -205,6 +205,7 @@ function init_all() { @@ -198,6 +198,7 @@ function init_all() {
register_module("panePrivacy", gPrivacyPane); // the entire document.
register_module("paneContainers", gContainersPane); Preferences.queueUpdateOfAllElements();
register_module("paneTranslations", gTranslationsPane); Services.telemetry.setEventRecordingEnabled("aboutpreferences", true);
+ register_module("paneZenLooks", gZenLooksAndFeel); + register_module("paneZenLooks", gZenLooksAndFeel);
if (Services.prefs.getBoolPref("browser.preferences.experimental")) {
// Set hidden based on previous load's hidden value. register_module("paneGeneral", gMainPane);
document.getElementById("category-experimental").hidden = register_module("paneHome", gHomePane);

32
src/browser/components/preferences/preferences-xhtml.patch
View File

@@ -1,35 +1,17 @@
diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
index 38fba9a7265cbcec406fd4145014083286fa798e..c54b900f0329c95ae706eb6df42fd7f7e2dc41c9 100644 index eee227822a772bec128d6adbe4f6aca90ed810f6..54d0f2df0c422a7d8ae0fbe10ef6c072bd7d6453 100644
--- a/browser/components/preferences/preferences.xhtml --- a/browser/components/preferences/preferences.xhtml
+++ b/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml
@@ -42,6 +42,10 @@ @@ -43,6 +43,8 @@
href="chrome://browser/skin/preferences/containers.css"
/> />
<link rel="stylesheet" href="chrome://browser/skin/preferences/privacy.css" /> <link rel="stylesheet" href="chrome://browser/skin/preferences/privacy.css" />
+ <link
+ rel="stylesheet"
+ href="chrome://browser/skin/preferences/zen-preferences.css"
+ />
+#include zen-preferences-links.xhtml
+
<link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="browser/browser.ftl"/> <link rel="localization" href="browser/browser.ftl"/>
@@ -52,6 +56,7 @@ <!-- Used by fontbuilder.js -->
<link rel="localization" href="toolkit/branding/accounts.ftl"/> @@ -112,6 +114,17 @@
<link rel="localization" href="toolkit/branding/brandings.ftl"/>
<link rel="localization" href="toolkit/featuregates/features.ftl"/>
+ <link rel="localization" href="browser/preferences/zen-preferences.ftl"/>
<!-- Links below are only used for search-l10n-ids into subdialogs -->
<link rel="localization" href="browser/aboutDialog.ftl"/>
@@ -84,6 +89,7 @@
<script src="chrome://browser/content/migration/migration-wizard.mjs" type="module"></script>
<script type="module" src="chrome://global/content/elements/moz-toggle.mjs"/>
<script type="module" src="chrome://global/content/elements/moz-message-bar.mjs" />
+ <script src="chrome://browser/content/zenThemeModifier.js"/>
</head>
<html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -111,6 +117,17 @@
<label class="category-name" flex="1" data-l10n-id="pane-general-title"></label> <label class="category-name" flex="1" data-l10n-id="pane-general-title"></label>
</richlistitem> </richlistitem>
@@ -47,7 +29,7 @@ index 38fba9a7265cbcec406fd4145014083286fa798e..c54b900f0329c95ae706eb6df42fd7f7
<richlistitem id="category-home" <richlistitem id="category-home"
class="category" class="category"
value="paneHome" value="paneHome"
@@ -247,6 +264,7 @@ @@ -248,6 +261,7 @@
#include sync.inc.xhtml #include sync.inc.xhtml
#include experimental.inc.xhtml #include experimental.inc.xhtml
#include moreFromMozilla.inc.xhtml #include moreFromMozilla.inc.xhtml

7
src/browser/components/preferences/zen-preferences-links.xhtml Normal file
View File

@@ -0,0 +1,7 @@
<link rel="localization" href="browser/preferences/zen-preferences.ftl"/>
<link
rel="stylesheet"
href="chrome://browser/skin/preferences/zen-preferences.css"
/>
<script src="chrome://browser/content/zenThemeModifier.js"/>
<link rel="localization" href="browser/preferences/zen-preferences.ftl"/>

26
src/browser/components/tabpreview/tabpreview-css.patch
View File

@@ -1,29 +1,8 @@
diff --git a/browser/components/tabpreview/tabpreview.css b/browser/components/tabpreview/tabpreview.css diff --git a/browser/components/tabpreview/tabpreview.css b/browser/components/tabpreview/tabpreview.css
index 8b288cb95da0e5fe307437e300d2c03ae19ab397..13a1f652bfd44af6ef317e7c997e101ac84c0ece 100644 index 776f520c7da2cf3e2dcc5f1395a3266f1c009ea0..2605963b023c507ab63c3ac8b761477da8550ce8 100644
--- a/browser/components/tabpreview/tabpreview.css --- a/browser/components/tabpreview/tabpreview.css
+++ b/browser/components/tabpreview/tabpreview.css +++ b/browser/components/tabpreview/tabpreview.css
@@ -3,9 +3,9 @@ @@ -57,3 +57,24 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
.tab-preview-container {
- background-color: #ffffff;
+ background-color: #fdfdfd;
color: #15141a;
- border-radius: 9px;
+ border-radius: 7px;
display: inline-block;
width: 280px;
overflow: hidden;
@@ -38,7 +38,7 @@
@media (prefers-color-scheme: dark) {
.tab-preview-container {
- background-color: #42414d;
+ background-color: #333237;
color: #fbfbfe;
}
.tab-preview-uri {
@@ -61,3 +61,24 @@
display: none; display: none;
} }
} }
@@ -48,3 +27,4 @@ index 8b288cb95da0e5fe307437e300d2c03ae19ab397..13a1f652bfd44af6ef317e7c997e101a
+.tab-preview-thumbnail-container canvas { +.tab-preview-thumbnail-container canvas {
+ border-top: 1px solid var(--zen-border-color); + border-top: 1px solid var(--zen-border-color);
+} +}
\ No newline at end of file

15
src/browser/themes/shared/customizableui/panelUI-shared-css.patch Normal file
View File

@@ -0,0 +1,15 @@
diff --git a/browser/themes/shared/customizableui/panelUI-shared.css b/browser/themes/shared/customizableui/panelUI-shared.css
index 4f282b9d5a5a3269268ae22f1702c7a6e8238375..d6e8e6cee7166f0eea99f260cca382eeece6684d 100644
--- a/browser/themes/shared/customizableui/panelUI-shared.css
+++ b/browser/themes/shared/customizableui/panelUI-shared.css
@@ -717,8 +717,8 @@ toolbarbutton[constrain-size="true"][cui-areatype="panel"] > .toolbarbutton-badg
/* Firefox Account Toolbar Panel */
#fxa-avatar-image {
- width: 16px;
- height: 16px;
+ width: 20px;
+ height: 20px;
}
:root {

13
src/browser/themes/shared/toolbarbuttons-css.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/browser/themes/shared/toolbarbuttons.css b/browser/themes/shared/toolbarbuttons.css
index f535fba9df5e7595c974e45dd95849d05736957f..19437c90e0f438384e2a223feff99bc93a441684 100644
--- a/browser/themes/shared/toolbarbuttons.css
+++ b/browser/themes/shared/toolbarbuttons.css
@@ -47,7 +47,7 @@
> .toolbarbutton-icon,
> .toolbarbutton-badge-stack > .toolbarbutton-icon {
- width: 16px;
+ width: 20px;
}
}

6
src/browser/themes/shared/zen-browser-shared.css
View File

@@ -128,8 +128,8 @@
toolbar .toolbarbutton-1 { toolbar .toolbarbutton-1 {
& > .toolbarbutton-icon, & > .toolbarbutton-icon,
& > .toolbarbutton-badge-stack { & > .toolbarbutton-badge-stack {
width: calc(2 * var(--toolbarbutton-inner-padding) + 18px) !important; width: calc(2 * var(--toolbarbutton-inner-padding) + 20px) !important;
height: calc(2 * var(--toolbarbutton-inner-padding) + 18px) !important; height: calc(2 * var(--toolbarbutton-inner-padding) + 20px) !important;
} }
} }
@@ -139,7 +139,7 @@ toolbar .toolbarbutton-1 {
border-bottom-left-radius: 0 !important; border-bottom-left-radius: 0 !important;
} }
#identity-box:has(#identity-permission-box[hasPermissions]) #identity-icon-box { #identity-box:has(#identity-permission-box:is([hasPermissions], [hasSharingIcon])) #identity-icon-box {
border-top-right-radius: 0 !important; border-top-right-radius: 0 !important;
border-bottom-right-radius: 0 !important; border-bottom-right-radius: 0 !important;
margin-right: 0 !important; margin-right: 0 !important;

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

@@ -54,7 +54,7 @@
#TabsToolbar .toolbarbutton-1 > :is(.toolbarbutton-icon, .toolbarbutton-badge-stack), #TabsToolbar .toolbarbutton-1 > :is(.toolbarbutton-icon, .toolbarbutton-badge-stack),
.zen-sidebar-action-button { .zen-sidebar-action-button {
border-radius: 10px !important; border-radius: 100px !important;
} }
#TabsToolbar .toolbarbutton-1:hover > :is(.toolbarbutton-icon, .toolbarbutton-badge-stack), #TabsToolbar .toolbarbutton-1:hover > :is(.toolbarbutton-icon, .toolbarbutton-badge-stack),