mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-09-05 19:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Zen browser components submodule commit reference

Browse Source
This commit is contained in:
Mauro Balades
2024-08-07 00:06:45 +02:00
parent 056f70a6fa
commit de19bdf2b4
20 changed files with 108 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/src/alpha-build.sh vendored
View File

@@ -1,5 +1,7 @@
set -ex
. ./.github/workflows/src/set-global-vars.sh
if command -v apt-get &> /dev/null
then
sudo apt-get update

3
.github/workflows/src/set-global-vars.sh vendored Normal file
View File

@@ -0,0 +1,3 @@
export MOZ_APP_UA_NAME="Firefox"
export MOZ_APP_VENDOR="Zen Browser"

2
README.md
View File

@@ -13,7 +13,7 @@ Experience tranquillity while browsing the web without people tracking you!
# Compatibility
Zen is currently built using firefox version `128.0.3`!
Zen is currently built using firefox version `129.0`!
* Checkout the latest [releases notes](https://get-zen.vercel.app/release-notes)!

6
configs/common/mozconfig
View File

@@ -4,7 +4,6 @@ ac_add_options --with-app-basename=Zen
ac_add_options --enable-official-branding
export MOZ_USER_DIR="${name}"
export MOZ_APP_VENDOR="${vendor}"
export MOZ_APP_BASENAME=Zen
export MOZ_APP_PROFILE=${binName}
export MOZ_APP_DISPLAYNAME="${name}"
@@ -94,8 +93,9 @@ mk_add_options MOZ_DATA_REPORTING=0
mk_add_options MOZ_SERVICES_HEALTHREPORT=0
mk_add_options MOZ_TELEMETRY_REPORTING=0
export MOZ_APP_UA_NAME="Firefox"
# Allow loading unsigned extensions
export MOZ_REQUIRE_SIGNING=1
mk_add_options MOZ_REQUIRE_SIGNING=1
# Sorry ptr, I didnt mean to!
ac_add_options --without-wasm-sandboxed-libraries

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

@@ -112,4 +112,6 @@ pref('browser.migrate.opera.enabled', true);
// pref('network.proxy.type', 0);
// pref('network.trr.mode', 5);
pref('xpinstall.signatures.required', false);
#include better-fox.js

69
src/browser/base/content/browser-css.patch
View File

@@ -1,69 +0,0 @@
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index cdd08ec8f3d3cd652be9fcf6d4fb5b50dcf270ba..6cb35378aea2e7967dff0c91d09201b053645fbd 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -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("chrome://global/skin/zen-global-shared.css");
+
@namespace html url("http://www.w3.org/1999/xhtml");
panelmultiview {
@@ -566,9 +568,9 @@ printpreview-pagination:focus-within,
#sidebar-box {
- min-width: 14em;
+ min-width: 323px;
max-width: 36em;
- width: 18em;
+ width: 393px;
}
/* WebExtension Sidebars */
@@ -583,3 +585,43 @@ printpreview-pagination:focus-within,
toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
-moz-user-focus: normal;
}
+
+
+/**
+ *
+ * ZEN OVERRIDES
+ */
+
+.content-prompt-dialog > .dialogOverlay {
+ align-content: start;
+}
+
+.dialogBox:not(.spotlightBox) {
+ border: 1px solid var(--zen-dialog-border-color);
+}
+
+#window-modal-dialog:not([zen-dialog-welcome-element="true"]) .dialogBox:not(.spotlightBox) {
+ transform: translateY(-9px);
+}
+
+#window-modal-dialog[zen-dialog-welcome-element="true"] .dialogBox:not(.spotlightBox) {
+ margin: 0 !important;
+}
+
+#window-modal-dialog[zen-dialog-welcome-element="true"],
+#window-modal-dialog[zen-dialog-welcome-element="true"] .dialogOverlay,
+#window-modal-dialog[zen-dialog-welcome-element="true"] .dialogFrame,
+#window-modal-dialog[zen-dialog-welcome-element="true"] .dialogBox {
+ width: 100% !important;
+ height: 100% !important;
+ max-height: none !important;
+ max-width: none !important;
+}
+
+#window-modal-dialog[zen-dialog-welcome-element="true"] {
+ --zen-welcome-dialog-space: 7px;
+ margin: 0 auto !important;
+ max-width: calc(100% - calc(var(--zen-welcome-dialog-space) * 2)) !important;
+ max-height: calc(100% - calc(var(--zen-welcome-dialog-space) * 2)) !important;
+ margin-top: var(--zen-welcome-dialog-space) !important;
+}

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

@@ -1,8 +1,8 @@
diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
index a2725d45b2c40ee9c718142dd48e22985adfdbd6..888c91058b3266e5a17aea98f7efaee2d11ec9e5 100644
index 1fb595272a184f9a40f56f87d86232e3324f7750..8dd0f0ff856be524a5fa27fb8c6180c1fe058134 100644
--- a/browser/base/content/main-popupset.inc.xhtml
+++ b/browser/base/content/main-popupset.inc.xhtml
@@ -169,6 +169,10 @@
@@ -144,6 +144,10 @@
hidden="true"
tabspecific="true"
aria-labelledby="editBookmarkPanelTitle">
@@ -13,22 +13,15 @@ index a2725d45b2c40ee9c718142dd48e22985adfdbd6..888c91058b3266e5a17aea98f7efaee2
<box class="panel-header">
<html:h1>
<html:span id="editBookmarkPanelTitle"/>
@@ -191,12 +195,14 @@
class="footer-button"
data-l10n-id="bookmark-panel-save-button"
default="true"
+ autofocus="true"
oncommand="StarUI.panel.hidePopup();"/>
<button id="editBookmarkPanelRemoveButton"
class="footer-button"
oncommand="StarUI.removeBookmarkButtonCommand();"/>
@@ -169,6 +173,7 @@
class="footer-button"/>
</html:moz-button-group>
</vbox>
+ </vbox>
</panel>
</html:template>
@@ -523,6 +529,8 @@
@@ -454,6 +459,8 @@
#include popup-notifications.inc

18
src/browser/base/content/nsContextMenu-js.patch
View File

@@ -1,18 +0,0 @@
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index b5c8dd44daaab18397cf01d0ef9f5288f5113925..8840b8171d5992da0a2f6216d8da9e1ec6dc1e93 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -1047,6 +1047,13 @@ class nsContextMenu {
!this.isSecureAboutPage()
);
+ this.showItem(
+ "context-zenAddToWebPanel",
+ this.onLink && !this.onMailtoLink && !this.onTelLink
+ );
+
+ this.showItem("context-zenSplitLink", this.onLink && !this.onMailtoLink && !this.onTelLink);
+
let copyLinkSeparator = document.getElementById("context-sep-copylink");
// Show "Copy Link", "Copy" and "Copy Clean Link" with no divider, and "copy link" and "Send link to Device" with no divider between.
// Other cases will show a divider.

18
src/browser/base/content/nsContextMenu-sys-mjs.patch Normal file
View File

@@ -0,0 +1,18 @@
diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
index 6c2317b8036378c6b8e0ad9a4fe71388bcb385f5..4bf277b02d3c69efc0f2d46c8b0f9deb7d7fb45a 100644
--- a/browser/base/content/nsContextMenu.sys.mjs
+++ b/browser/base/content/nsContextMenu.sys.mjs
@@ -1153,6 +1153,13 @@ export class nsContextMenu {
!this.isSecureAboutPage()
);
+ this.showItem(
+ "context-zenAddToWebPanel",
+ this.onLink && !this.onMailtoLink && !this.onTelLink
+ );
+
+ this.showItem("context-zenSplitLink", this.onLink && !this.onMailtoLink && !this.onTelLink);
+
let copyLinkSeparator = this.document.getElementById(
"context-sep-copylink"
);

2
src/browser/base/content/zen-components

Submodule src/browser/base/content/zen-components updated: 99ba15e4e8...448da51206

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
index 6cbac7c0826856adfcdafd3507e05f3efac95a2d..966289f04246deefe3dcb233f7fcb755fccfdbc6 100644
index d05d561b6d01b11a36c762fc39dc13e14181bce7..cbb85d7019a68f283e38c45172eda605c7b90144 100644
--- a/browser/components/sidebar/browser-sidebar.js
+++ b/browser/components/sidebar/browser-sidebar.js
@@ -404,6 +404,7 @@ var SidebarController = {
} else {
@@ -471,6 +471,7 @@ var SidebarController = {
this._box.removeAttribute("positionend");
sidebarMain.removeAttribute("positionend");
sidebarContainer.removeAttribute("positionend");
+ this._box.style.order = 0;
}

2
src/browser/components/tabbrowser/content/tabs-js.patch
View File

@@ -153,13 +153,13 @@ index 3b97732d8035f07a2308f76f235702c70a5fa388..edbc1ad66a84fd17b1674ff7852cdf01
+ this.toggleAttribute("overflow", true);
+
let arrowScrollbox = this.arrowScrollbox;
let previewElement = document.getElementById("tab-preview-panel");
arrowScrollbox.shadowRoot.addEventListener(
"underflow",
event => {
+ return;
// Ignore underflow events:
// - from nested scrollable elements
// - for vertical orientation
@@ -1471,11 +1518,11 @@
for (let i = numPinned - 1; i >= 0; i--) {
let tab = tabs[i];

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

@@ -1,17 +1,18 @@
diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
index 61119b7564d37e55f49dab7e6e14faafb4baa298..bcaad1a231cc839579ed209307c8e95cfb4c37de 100644
index f2171eb033a1143870f4708c63f565fabb535c4b..a21631e56e74d5d1887554d2752a612887ed20c5 100644
--- a/browser/themes/shared/browser-shared.css
+++ b/browser/themes/shared/browser-shared.css
@@ -27,6 +27,8 @@
@@ -27,6 +27,9 @@
@import url("chrome://browser/skin/UITour.css");
@import url("chrome://browser/skin/formautofill-notification.css");
+@import url("chrome://global/skin/zen-global-shared.css");
+@import url("chrome://browser/skin/zen-browser-shared.css");
+
@namespace html url("http://www.w3.org/1999/xhtml");
:root,
@@ -75,7 +77,7 @@ body {
@@ -73,7 +76,7 @@ body {
--short-notification-gradient: #9059FF;
--button-bgcolor: color-mix(in srgb, currentColor 13%, transparent);
@@ -20,7 +21,7 @@ index 61119b7564d37e55f49dab7e6e14faafb4baa298..bcaad1a231cc839579ed209307c8e95c
--button-active-bgcolor: color-mix(in srgb, currentColor 30%, transparent);
--button-color: currentColor;
--button-primary-bgcolor: AccentColor;
@@ -181,7 +183,6 @@ body {
@@ -179,7 +182,6 @@ body {
appearance: none;
/* Toolbar / content area border */
@@ -28,7 +29,7 @@ index 61119b7564d37e55f49dab7e6e14faafb4baa298..bcaad1a231cc839579ed209307c8e95c
background-color: var(--toolbox-non-lwt-bgcolor);
color: var(--toolbox-non-lwt-textcolor);
@@ -190,37 +191,13 @@ body {
@@ -188,37 +190,13 @@ body {
transition: background-color var(--inactive-window-transition);
&:-moz-window-inactive {

2
src/browser/themes/shared/identity-block/identity-block-css.patch
View File

@@ -16,7 +16,7 @@ index 39ae2b00791a7bfd875961de60736612f08892ae..5d950d855a5625ebfb20f6f49a65f3e1
@@ -154,11 +155,11 @@
}
#urlbar:not(.searchButton) > .urlbar-input-container > #identity-box[pageproxystate="invalid"] #identity-icon {
#identity-box[pageproxystate="invalid"] #identity-icon {
- list-style-image: url(chrome://global/skin/icons/search-glass.svg);
+ list-style-image: url(chrome://global/skin/icons/search-glass.svg) !important;
}

37
src/browser/themes/shared/tabbrowser/tabs-css.patch
View File

@@ -1,26 +1,22 @@
diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
index 9a915ff442cc7f01ddec3fcea931c21e210cac92..701d0cdf4d5e5a1c2f6baf21c345a7e3b6f26592 100644
index 22d1fe3d0730062abdc181912e93721fdc1c824d..c004692a31ad57aef45423c7bce104e8b056cb3e 100644
--- a/browser/themes/shared/tabbrowser/tabs.css
+++ b/browser/themes/shared/tabbrowser/tabs.css
@@ -39,7 +39,7 @@
#tabbrowser-tabs {
--tab-min-width: 76px;
@@ -17,7 +17,7 @@
--tab-border-radius: 4px;
--tab-shadow-max-size: 6px;
--tab-block-margin: 4px;
- --tab-loading-fill: #0A84FF;
+ --tab-loading-fill: var(--zen-primary-color);
--tab-overflow-pinned-tabs-width: 0px;
padding-inline: var(--tab-overflow-pinned-tabs-width) 0;
/* Use a bigger flex value than the searchbar to prevent it from
@@ -103,7 +103,7 @@
* (we only have 2px padding in the inline direction) */
overflow-clip-margin: 2px;
--tab-selected-textcolor: var(--toolbar-color);
--tab-selected-bgcolor: var(--toolbar-bgcolor);
--tab-selected-color-scheme: var(--toolbar-color-scheme);
@@ -122,11 +122,11 @@
visibility: hidden;
}
- &:not([pinned]) {
- &[pinned] {
+ & {
flex: 100 100;
max-width: 225px;
min-width: var(--tab-min-width);
@@ -126,7 +126,7 @@
flex-shrink: 0;
#tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > & {
@@ -29,16 +25,17 @@ index 9a915ff442cc7f01ddec3fcea931c21e210cac92..701d0cdf4d5e5a1c2f6baf21c345a7e3
display: block;
}
}
@@ -357,8 +357,6 @@
@@ -357,8 +357,7 @@
animation-delay: -1.5s;
}
- &[selected]:not([src], [pinned], [crashed], [pictureinpicture]),
- &:not([src], [pinned], [crashed], [sharing], [pictureinpicture]),
+
&[busy] {
display: none;
}
@@ -627,7 +625,7 @@
@@ -627,7 +626,7 @@
#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab:nth-child(1 of :not([pinned], [hidden])) {
/* Add a gap between the last pinned tab and the first visible tab */
@@ -47,7 +44,7 @@ index 9a915ff442cc7f01ddec3fcea931c21e210cac92..701d0cdf4d5e5a1c2f6baf21c345a7e3
}
.tab-label[attention]:not([selected]) {
@@ -737,6 +735,7 @@
@@ -772,6 +771,7 @@ sidebar-main[expanded] > #vertical-tabs > #tabbrowser-tabs[orient="vertical"] .t
.titlebar-spacer[type="pre-tabs"],
.titlebar-spacer[type="post-tabs"] {
width: 40px;
@@ -55,7 +52,7 @@ index 9a915ff442cc7f01ddec3fcea931c21e210cac92..701d0cdf4d5e5a1c2f6baf21c345a7e3
}
@media (max-width: 500px) {
@@ -752,7 +751,7 @@
@@ -787,7 +787,7 @@ sidebar-main[expanded] > #vertical-tabs > #tabbrowser-tabs[orient="vertical"] .t
toolbarbutton:not(#firefox-view-button),
toolbarpaletteitem:not(#wrapper-firefox-view-button)
) + #tabbrowser-tabs {

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

@@ -948,3 +948,41 @@ panelmultiview {
}
}
/**
*
* ZEN OVERRIDES
*/
.content-prompt-dialog > .dialogOverlay {
align-content: start;
}
.dialogBox:not(.spotlightBox) {
border: 1px solid var(--zen-dialog-border-color);
}
#window-modal-dialog:not([zen-dialog-welcome-element="true"]) .dialogBox:not(.spotlightBox) {
transform: translateY(-9px);
}
#window-modal-dialog[zen-dialog-welcome-element="true"] .dialogBox:not(.spotlightBox) {
margin: 0 !important;
}
#window-modal-dialog[zen-dialog-welcome-element="true"],
#window-modal-dialog[zen-dialog-welcome-element="true"] .dialogOverlay,
#window-modal-dialog[zen-dialog-welcome-element="true"] .dialogFrame,
#window-modal-dialog[zen-dialog-welcome-element="true"] .dialogBox {
width: 100% !important;
height: 100% !important;
max-height: none !important;
max-width: none !important;
}
#window-modal-dialog[zen-dialog-welcome-element="true"] {
--zen-welcome-dialog-space: 7px;
margin: 0 auto !important;
max-width: calc(100% - calc(var(--zen-welcome-dialog-space) * 2)) !important;
max-height: calc(100% - calc(var(--zen-welcome-dialog-space) * 2)) !important;
margin-top: var(--zen-welcome-dialog-space) !important;
}

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

@@ -54,7 +54,6 @@
#zen-sidebar-web-panel-wrapper {
--zen-default-sidebar-width: 300px;
position: relative;
height: 100%;
margin-right: 0;
display: flex;
pointer-events: none;
@@ -81,7 +80,6 @@
}
#zen-sidebar-web-panel {
--zen-initial-height: calc(100% - var(--zen-sidebar-web-panel-spacing) * 3);
border-radius: var(--zen-panel-radius);
overflow: hidden;
border: var(--zen-appcontent-border);
@@ -93,13 +91,12 @@
max-width: 720px;
min-height: var(--zen-default-sidebar-width);
width: calc(var(--zen-default-sidebar-width) + 200px);
height: var(--zen-initial-height);
pointer-events: all;
}
#zen-sidebar-web-panel:not([pinned="true"]) {
/* We need to always override the height */
height: var(--zen-initial-height) !important;
height: unset !important;
}
#zen-sidebar-web-panel-splitter {
@@ -124,10 +121,12 @@
cursor: ns-resize;
}
#zen-sidebar-web-panel:not([hidden="true"]) #zen-sidebar-web-panel-hsplitter,
#zen-sidebar-web-panel-wrapper[hidden="true"] + #zen-sidebar-web-panel-splitter,
#zen-sidebar-web-panel-wrapper[hidden="true"] + #zen-sidebar-web-panel-hsplitter,
#zen-sidebar-web-panel-wrapper:has(#zen-sidebar-web-panel:not([pinned="true"])) + #zen-sidebar-web-panel-splitter {
display: none;
margin: 0;
}
#zen-sidebar-web-panel:not([pinned="true"]) {

2
src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch
View File

@@ -14,7 +14,7 @@ index 0d3993370b4ecbdfaf87cfd3145617343c29dc39..8587f7286476ca0dcce1bb02ef02ce0d
@@ -334,6 +334,7 @@ LightweightThemeConsumer.prototype = {
theme.additionalBackgrounds
);
_setProperties(root, hasTheme, theme);
let _processedColors = _setProperties(root, hasTheme, theme);
+ this._zenSetAccentColor(root);
if (hasTheme) {

4
src/toolkit/themes/shared/in-content/common-shared-css.patch
View File

@@ -1,5 +1,5 @@
diff --git a/toolkit/themes/shared/in-content/common-shared.css b/toolkit/themes/shared/in-content/common-shared.css
index 542e38159dde876566f520f7d45d5387c1982d34..92705331fa12d88e9091310c1f527562931e7132 100644
index 2b59a0604b4bfefd3bdcfdb9a3964937e9699114..92705331fa12d88e9091310c1f527562931e7132 100644
--- a/toolkit/themes/shared/in-content/common-shared.css
+++ b/toolkit/themes/shared/in-content/common-shared.css
@@ -5,6 +5,8 @@
@@ -15,7 +15,7 @@ index 542e38159dde876566f520f7d45d5387c1982d34..92705331fa12d88e9091310c1f527562
--in-content-table-border-color: var(--in-content-box-border-color);
--in-content-table-header-background: var(--in-content-primary-button-background);
--in-content-table-header-color: var(--in-content-primary-button-text-color);
- --in-content-sidebar-width: 240px;
- --in-content-sidebar-width: 280px;
+ --in-content-sidebar-width: 340px;
--dialog-warning-text-color: var(--red-60);

2
surfer.json
View File

@@ -5,7 +5,7 @@
"binaryName": "zen",
"version": {
"product": "firefox",
"version": "128.0.3"
"version": "129.0"
},
"buildOptions": {
"generateBranding": true