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

Update Firefox version to 134.0.2 in README and surfer.json

Browse Source
This commit is contained in:
mr. M
2025-01-21 18:29:20 +01:00
parent a66abd037e
commit eede41fb18
10 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -28,7 +28,7 @@
## 🖥️ Compatibility
Zen is currently built using firefox version `134.0.1`! 🚀
Zen is currently built using firefox version `134.0.2`! 🚀
- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using firefox version `RC 134.0.2`!
- Check out the latest [release notes](https://zen-browser.app/release-notes)!

3
src/browser/base/content/ZenCustomizableUI.sys.mjs
View File

@@ -64,6 +64,7 @@ export var ZenCustomizableUI = new (class {
addon-webext-overflowtarget="overflowed-extensions-list"
mode="icons">
<hbox id="zen-sidebar-top-buttons-customization-target" class="customization-target" flex="1">
<html:div id="zen-sidebar-top-buttons-separator" skipintoolbarset="true" overflows="false"></html:div>
</hbox>
</toolbar>
`);
@@ -85,7 +86,7 @@ export var ZenCustomizableUI = new (class {
for (let id of this.defaultSidebarIcons) {
const elem = window.document.getElementById(id);
if (!elem) continue;
if (!elem || elem.id === 'zen-workspaces-button') continue;
elem.setAttribute('removable', 'true');
}

5
src/browser/base/content/ZenUIManager.mjs
View File

@@ -198,10 +198,7 @@ var gZenVerticalTabsManager = {
if (this.__topButtonsSeparatorElement) {
return this.__topButtonsSeparatorElement;
}
this.__topButtonsSeparatorElement = document.createElement('div');
this.__topButtonsSeparatorElement.id = 'zen-sidebar-top-buttons-separator';
this.__topButtonsSeparatorElement.setAttribute('skipintoolbarset', 'true');
this.__topButtonsSeparatorElement.setAttribute('overflows', 'false');
this.__topButtonsSeparatorElement = document.getElementById('zen-sidebar-top-buttons-separator');
return this.__topButtonsSeparatorElement;
},

2
src/browser/base/content/zen-sidebar-icons.inc.xhtml
View File

@@ -9,7 +9,7 @@
mode="icons">
<toolbarbutton removable="true" class="chromeclass-toolbar-additional toolbarbutton-1 zen-sidebar-action-button" id="zen-expand-sidebar-button" data-l10n-id="sidebar-zen-expand" cui-areatype="toolbar" oncommand="gZenVerticalTabsManager.toggleExpand();"></toolbarbutton>
<toolbarbutton removable="true" class="toolbarbutton-1 zen-sidebar-action-button zen-compact-mode-ignore" id="zen-sidepanel-button" data-l10n-id="sidebar-zen-sidepanel" onclick="gZenBrowserManagerSidebar.toggle();"></toolbarbutton>
<toolbarbutton removable="false" id="zen-workspaces-button"></toolbarbutton>
<toolbarbutton id="zen-workspaces-button" class="chromeclass-toolbar-additional" overflows="false" removable="false"></toolbarbutton>
<toolbarbutton id="zen-profile-button"
class="zen-sidebar-action-button toolbarbutton-1 chromeclass-toolbar-additional"
delegatesanchor="true"

5
src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
View File

@@ -228,7 +228,7 @@
border-bottom: 0px solid transparent !important;
--tab-block-margin: 2px;
--tab-selected-bgcolor: light-dark(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.11));
--tab-selected-bgcolor: light-dark(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.12));
grid-gap: 0 !important;
&[overflow]::after,
@@ -916,8 +916,7 @@
}
&:not([selected], [multiselected="true"]) .tab-background {
background: transparent;
backdrop-filter: var(--zen-toolbar-element-filter) !important;
background: var(--zen-toolbar-element-bg);
border: none;
}

15
src/browser/base/content/zen-styles/zen-theme.css
View File

@@ -104,10 +104,7 @@
--zen-button-border-radius: 5px;
--zen-button-padding: 0.6rem 1.2rem;
--zen-toolbar-element-filter: brightness(0.95);
@media (prefers-color-scheme: dark) {
--zen-toolbar-element-filter: brightness(1.25);
}
--zen-toolbar-element-bg: light-dark(rgba(0,0,0,.11), rgba(255,255,255,.11));
/* Toolbar */
--zen-toolbar-height: 38px;
@@ -190,7 +187,15 @@
/** Other theme-related styles */
@media (-moz-platform: macos) {
font-family: 'SF Pro';
font-family:
SF Pro,
ui-sans-serif,
system-ui,
sans-serif,
Apple Color Emoji,
Segoe UI Emoji,
Segoe UI Symbol,
Noto Color Emoji;
}
}

3
src/browser/base/content/zen-styles/zen-urlbar.css
View File

@@ -27,8 +27,7 @@
}
#urlbar-background {
background: transparent !important;
backdrop-filter: var(--zen-toolbar-element-filter);
background: var(--zen-toolbar-element-bg) !important;
outline: none !important;
}

9
src/browser/base/zen-components/ZenWorkspaces.mjs
View File

@@ -1058,14 +1058,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
button.firstChild.remove();
}
for (let attr of [...button.attributes]) {
if (attr.name !== 'id') {
button.removeAttribute(attr.name);
}
}
button.className = '';
if (this._workspacesButtonClickListener) {
button.removeEventListener('click', this._workspacesButtonClickListener);
this._workspacesButtonClickListener = null;
@@ -1075,7 +1067,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
this._workspaceButtonContextMenuListener = null;
}
button.setAttribute('removable', 'true');
button.setAttribute('showInPrivateBrowsing', 'false');
button.setAttribute('tooltiptext', 'Workspaces');
if (this.shouldShowIconStrip) {

34
src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..bb822f3f8639aa23c447c1cd528ddf2ceb102e72 100644
index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..f2245f7d4e0b49d209b8ccca457e8500a3b024a1 100644
--- a/browser/components/customizableui/CustomizableUI.sys.mjs
+++ b/browser/components/customizableui/CustomizableUI.sys.mjs
@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -124,15 +124,33 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..bb822f3f8639aa23c447c1cd528ddf2c
/**
* Add a widget to an area.
* If the area to which you try to add is not known to CustomizableUI,
@@ -6407,7 +6406,7 @@ class OverflowableToolbar {
getInlineSize(this.#toolbar) -
parseFloat(style.paddingLeft) -
parseFloat(style.paddingRight) -
- toolbarChildrenWidth;
+ toolbarChildrenWidth - (win.gZenVerticalTabsManager._hasSetSingleToolbar ? 1 : 0); // -1px so we can calculate the overflow correctly
targetWidth = getInlineSize(this.#target);
@@ -6370,7 +6369,7 @@ class OverflowableToolbar {
*/
async #getOverflowInfo() {
function getInlineSize(aElement) {
- return aElement.getBoundingClientRect().width;
+ return aElement.getBoundingClientRect().width - ((win.gZenVerticalTabsManager._hasSetSingleToolbar && aElement.id == 'zen-sidebar-top-buttons-customization-target') ? win.gZenVerticalTabsManager._topButtonsSeparatorElement.getBoundingClientRect().width : 0);
}
function sumChildrenInlineSize(aParent, aExceptChild = null) {
@@ -6412,7 +6411,7 @@ class OverflowableToolbar {
targetChildrenWidth =
this.#target == this.#toolbar
? toolbarChildrenWidth
- : sumChildrenInlineSize(this.#target);
+ : sumChildrenInlineSize(this.#target, win.gZenVerticalTabsManager._topButtonsSeparatorElement);
});
lazy.log.debug(
@@ -6422,7 +6421,7 @@ class OverflowableToolbar {
// If the target has min-width: 0, their children might actually overflow
// it, so check for both cases explicitly.
let targetContentWidth = Math.max(targetWidth, targetChildrenWidth);
- let isOverflowing = Math.floor(targetContentWidth) > totalAvailWidth;
+ let isOverflowing = Math.floor(targetContentWidth) + (win.gZenVerticalTabsManager._hasSetSingleToolbar ? 0.1 : 0) > totalAvailWidth;
return { isOverflowing, targetContentWidth, totalAvailWidth };
}
@@ -6516,7 +6515,7 @@ class OverflowableToolbar {
}
}

2
surfer.json
View File

@@ -5,7 +5,7 @@
"binaryName": "zen",
"version": {
"product": "firefox",
"version": "134.0.1",
"version": "134.0.2",
"candidate": "134.0.2"
},
"buildOptions": {