diff --git a/README.md b/README.md index ab7f87bf..977a4ab9 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Experience tranquillity while browsing the web without people tracking you! # Compatibility -Zen is currently built using firefox version `130.0`! +Zen is currently built using firefox version `131.0`! - Check out the latest [release notes](https://zen-browser.app/release-notes)! diff --git a/package.json b/package.json index ffa01e37..60023ac3 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "homepage": "https://github.com/zen-browser/core#readme", "dependencies": { - "@zen-browser/surfer": "^1.4.24" + "@zen-browser/surfer": "^1.4.25" }, "devDependencies": { "husky": "^9.1.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f54e077d..1f27f044 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@zen-browser/surfer': - specifier: ^1.4.24 - version: 1.4.24 + specifier: ^1.4.25 + version: 1.4.25 devDependencies: husky: specifier: ^9.1.5 @@ -119,8 +119,8 @@ packages: '@types/node@17.0.45': resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} - '@zen-browser/surfer@1.4.24': - resolution: {integrity: sha512-Izcw7pZMc22HrSly/MjR6d8uXh9nY1g9tGmuISRDDqruZgcSG0i43GB/ftsaa651YPNlW4zXzfP9ammnsQpZlQ==} + '@zen-browser/surfer@1.4.25': + resolution: {integrity: sha512-gwRp8OV33ngL18yDKt7jqp+qrk/CqaYhEe8I4BjlU21Y+ogTmnkOggzxKKRwCwQf4PudYU5qKBZE998xa20V2w==} hasBin: true ansi-escapes@7.0.0: @@ -1003,7 +1003,7 @@ snapshots: '@types/node@17.0.45': {} - '@zen-browser/surfer@1.4.24': + '@zen-browser/surfer@1.4.25': dependencies: '@resvg/resvg-js': 1.4.0 async-icns: 1.0.2 diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index de5cac8c..f9680152 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -59,7 +59,7 @@ pref("browser.tabs.loadBookmarksInTabs", false); pref('browser.toolbars.bookmarks.visibility', 'never'); // Enable Do Not Track and GPC by default. -pref("privacy.donottrackheader.enabled", true); +pref("privacy.donottrackheader.enabled", false); pref("privacy.globalprivacycontrol.enabled", true); // Disable more telemetry pref("toolkit.telemetry.enabled", false); diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch index c831a8e8..ec8be5a5 100644 --- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch +++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch @@ -37,8 +37,8 @@ index 18b91c95b88d11ddb257de03f12bc3e4cc75a96a..f117cfa7c9d1f9eb537cebbef42a9d2d tooltip="dynamic-shortcut-tooltip" data-l10n-id="tabs-toolbar-new-tab"/> -- -+ +- ++ diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components index 42aba602..9ed34681 160000 --- a/src/browser/base/content/zen-components +++ b/src/browser/base/content/zen-components @@ -1 +1 @@ -Subproject commit 42aba602ca4d82d861d9f94b78493b27b9203f58 +Subproject commit 9ed3468118c85ecc3a7e053699e52edb4e0e4bf5 diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css index a48a7ab6..315f2469 100644 --- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css +++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css @@ -39,6 +39,10 @@ display: flex; } + .titlebar-spacer[type="pre-tabs"], + .titlebar-spacer[type="post-tabs"] { + display: none; + } #TabsToolbar-customization-target { position: relative; diff --git a/src/browser/components/newtab/content-src/components/Search/_Search-scss.patch b/src/browser/components/newtab/content-src/components/Search/_Search-scss.patch deleted file mode 100644 index e60ef54a..00000000 --- a/src/browser/components/newtab/content-src/components/Search/_Search-scss.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/browser/components/newtab/content-src/components/Search/_Search.scss b/browser/components/newtab/content-src/components/Search/_Search.scss -index 8ee4f7f13276c0aabcb1dd131307cbc6d0907fbf..dd3e22740cd4dcbb6a4b974165c3ccd1cd9cec70 100644 ---- a/browser/components/newtab/content-src/components/Search/_Search.scss -+++ b/browser/components/newtab/content-src/components/Search/_Search.scss -@@ -17,6 +17,8 @@ $glyph-forward: url('chrome://browser/skin/forward.svg'); - $logo-size: 82px; - $wordmark-size: 134px; - -+ display: none; -+ - align-items: center; - display: flex; - justify-content: center; diff --git a/src/browser/themes/shared/tabbrowser/tabs-css.patch b/src/browser/themes/shared/tabbrowser/tabs-css.patch index 84f5fee3..16879363 100644 --- a/src/browser/themes/shared/tabbrowser/tabs-css.patch +++ b/src/browser/themes/shared/tabbrowser/tabs-css.patch @@ -1,8 +1,8 @@ diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css -index 1ef4874d6e7f3b43f4c82db6a679883cf34ab493..12eef770f5ae48b83cadd10a4ed21b8fab508bfe 100644 +index 9f7331f2f00a8b0de6ce28a7029358a86eeb8873..2dc56a8455df9009bd1f524b377b8fdf09e124ca 100644 --- a/browser/themes/shared/tabbrowser/tabs.css +++ b/browser/themes/shared/tabbrowser/tabs.css -@@ -17,7 +17,7 @@ +@@ -15,7 +15,7 @@ --tab-border-radius: 4px; --tab-shadow-max-size: 6px; --tab-block-margin: 4px; @@ -11,40 +11,17 @@ index 1ef4874d6e7f3b43f4c82db6a679883cf34ab493..12eef770f5ae48b83cadd10a4ed21b8f --tab-hover-background-color: color-mix(in srgb, currentColor 11%, transparent); --tab-selected-textcolor: var(--toolbar-color); --tab-selected-bgcolor: var(--toolbar-bgcolor); -@@ -133,12 +133,12 @@ - visibility: hidden; +@@ -132,8 +132,7 @@ } -- &[pinned] { -+ & { - flex-shrink: 0; - - #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > & { -- position: absolute !important; -- display: block; -+ /*position: absolute !important; -+ display: block;*/ - } + #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > &[pinned] { +- position: absolute !important; +- display: block; ++ } -@@ -368,8 +368,6 @@ - animation-delay: -1.5s; - } - -- &[selected]:not([src], [pinned], [crashed], [pictureinpicture]), -- &:not([src], [pinned], [crashed], [sharing], [pictureinpicture]), - &[busy] { - display: none; - } -@@ -912,6 +910,7 @@ sidebar-main[expanded] > #vertical-tabs > #tabbrowser-tabs[orient="vertical"] > - .titlebar-spacer[type="pre-tabs"], - .titlebar-spacer[type="post-tabs"] { - width: 40px; -+ display: none !important; - } - - @media (max-width: 500px) { -@@ -927,7 +926,7 @@ sidebar-main[expanded] > #vertical-tabs > #tabbrowser-tabs[orient="vertical"] > + #tabbrowser-tabs[movingtab] > #tabbrowser-arrowscrollbox > &:is([selected], [multiselected]) { +@@ -952,7 +951,7 @@ sidebar-main[expanded] > #vertical-tabs > #tabbrowser-tabs[orient="vertical"] > toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button) ) + #tabbrowser-tabs { @@ -53,7 +30,7 @@ index 1ef4874d6e7f3b43f4c82db6a679883cf34ab493..12eef770f5ae48b83cadd10a4ed21b8f padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width) + 2px); margin-inline-start: 2px; } -@@ -962,7 +961,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button { +@@ -987,7 +986,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button { list-style-image: url(chrome://global/skin/icons/plus.svg); } diff --git a/src/toolkit/themes/shared/popup-css.patch b/src/toolkit/themes/shared/popup-css.patch index 3cbef549..95d9305f 100644 --- a/src/toolkit/themes/shared/popup-css.patch +++ b/src/toolkit/themes/shared/popup-css.patch @@ -1,18 +1,19 @@ diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css -index ed230860215c734e6fb903b3660d0c679043e3f3..1e54e023c930db04a532b2b125f44e73912f63ad 100644 +index a86b2e0e04769e25acbc6f7d2294dae895e3392e..dce7e1a2bdf52e616c987a04c0d5c1c1ede42676 100644 --- a/toolkit/themes/shared/popup.css +++ b/toolkit/themes/shared/popup.css -@@ -30,8 +30,6 @@ panel { +@@ -30,8 +30,7 @@ panel { --background-color-canvas: var(--panel-background); @media (-moz-platform: linux) { - --panel-border-radius: 8px; - --panel-padding-block: 3px; ++ @media (prefers-contrast) { --panel-border-color: color-mix(in srgb, currentColor 60%, transparent); -@@ -43,18 +41,7 @@ panel { - --panel-shadow-margin: 4px; +@@ -49,18 +48,7 @@ panel { + --panel-border-radius: 0px !important; } - @media (-moz-platform: macos) { @@ -31,11 +32,10 @@ index ed230860215c734e6fb903b3660d0c679043e3f3..1e54e023c930db04a532b2b125f44e73 &::part(content) { display: flex; -@@ -193,6 +180,6 @@ panel[type="arrow"] { +@@ -199,6 +187,5 @@ panel[type="arrow"] { } &[animating] { - pointer-events: none; -+ /*pointer-events: none;*/ } }