ZenBrowserMirrors/zen-desktop
1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-10 05:35:29 +02:00
Code Releases Wiki Activity

chore: Update Firefox version to 128.0!

Browse source
This commit is contained in:
Mauro Balades 2024-07-10 18:27:52 +02:00
parent eece97990d
commit 9fca7074ee
29 changed files with 177 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

20
.github/workflows/alpha.yml vendored
View file

@ -327,6 +327,7 @@ jobs:
cd ..
npm install -g pnpm
export SURFER_PLATFORM="win32"
pnpm surfer bootstrap
cd engine/
@ -354,11 +355,14 @@ jobs:
run: pnpm surfer import --verbose
- name: Build
run: pnpm build
run: |
export SURFER_PLATFORM="win32"
pnpm build
- name: Package
run: |
set -x
export SURFER_PLATFORM="win32"
pnpm package
mv ./dist/output.mar windows.mar
mv ./dist/zen-$(pnpm surfer get version | xargs).en-US.win64.zip zen.win64.zip
@ -383,6 +387,18 @@ jobs:
name: windows.mar
path: ./windows.mar
- name: Upload installer
uses: actions/upload-artifact@v3
with:
name: zen.installer.exe
path: ./dist/zen.installer.exe
- name: Upload installer stub
uses: actions/upload-artifact@v3
with:
name: zen.installer-stub.exe
path: ./dist/zen.installer-stub.exe
- name: Upload update manifests
uses: actions/upload-artifact@v3
with:
@ -575,6 +591,8 @@ jobs:
zen.source.tar.gz
linux.mar
windows.mar
zen.installer.exe
zen.installer-stub.exe
- name: List
run: find .

2
README.md
View file

@ -5,7 +5,7 @@ Experience tranquillity while browsing the web without people tracking you!
# Compatibility
Zen is currently built using firefox version `127.0.2`!
Zen is currently built using firefox version `128.0`!
## 🚀 Run Locally

8
package-lock.json generated
View file

@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "ISC",
"dependencies": {
"@zen-browser/surfer": "^1.0.4"
"@zen-browser/surfer": "^1.0.5"
}
},
"node_modules/@oozcitak/dom": {
@ -264,9 +264,9 @@
"integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
},
"node_modules/@zen-browser/surfer": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.0.4.tgz",
"integrity": "sha512-uDYuVFX7QvY2zuCwkuMnqR8YkmPf77JS2JZXjuBB4g5WGS3xaEoOqPAkbbo+HahAsKSwaiDuMsJs82V8+Hfe1g==",
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.0.5.tgz",
"integrity": "sha512-sMPpiAd+Zii84AzsWnIyBReQhkQk7nZq1IKMKRBgy5NqIHB6RZZqSDQT+WHGn/SJfqloUSchSvx1frynWPVXvg==",
"dependencies": {
"@resvg/resvg-js": "^1.4.0",
"async-icns": "^1.0.2",

3
package.json
View file

@ -4,6 +4,7 @@
"description": "",
"scripts": {
"build": "surfer build",
"build:ui": "surfer build --ui",
"start": "cd engine && ./mach run --noprofile",
"import": "surfer import",
"export": "surfer export",
@ -25,6 +26,6 @@
},
"homepage": "https://github.com/zen-browser/core#readme",
"dependencies": {
"@zen-browser/surfer": "^1.0.4"
"@zen-browser/surfer": "^1.0.5"
}
}

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
index 27c2d13fbd8599a131de6b70bba581d435198793..25aa7546d57e206b76838bc23b609f602af43a83 100644
index b8aa71126c2bb4521caf25f9caf845a8a429dc64..59cdc2e9998e802d6c79ff967eaa30088a3b7a21 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -3061,3 +3061,5 @@ pref("startup.homepage_override_nimbus_maxVersion", "");
pref("toolkit.contentRelevancy.enabled", false);
// Pref to enable the ingestion through the Rust component.
@@ -3110,3 +3110,5 @@ pref("toolkit.contentRelevancy.enabled", false);
pref("toolkit.contentRelevancy.ingestEnabled", false);
// Pref to enable extra logging for the content relevancy feature
pref("toolkit.contentRelevancy.log", false);
+
+#include zen-browser.js

11
src/browser/base/content/ZenWorkspaces.mjs
View file

@ -54,6 +54,17 @@ var ZenWorkspaces = {
// Workspaces management
_createWorkspaceData(windowID) {
let window = Services.wm.getOuterWindowWithId(windowID);
let tabs = Array.from(window.gBrowser.tabs).map(tab => ({
url: tab.linkedBrowser.currentURI.spec,
title: tab.label,
}));
return {
tabs,
};
},
async saveCurrentWorkspace(windowID) {
let workspaceData = this._createWorkspaceData(windowID);
await this.saveWorkspace(workspaceData, windowID);

44
src/browser/base/content/browser-css.patch
View file

@ -1,5 +1,5 @@
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 6e776a9ce7c525e510b6466065daf755b21567a4..8668b27ec2126ed772a11aa77809b6f22ceab7e2 100644
index cdd08ec8f3d3cd652be9fcf6d4fb5b50dcf270ba..6cb35378aea2e7967dff0c91d09201b053645fbd 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -2,6 +2,8 @@
@ -10,32 +10,8 @@ index 6e776a9ce7c525e510b6466065daf755b21567a4..8668b27ec2126ed772a11aa77809b6f2
+
@namespace html url("http://www.w3.org/1999/xhtml");
:root,
@@ -157,8 +159,6 @@ panelview:not([visible]) {
flex: 100 100;
max-width: 225px;
min-width: var(--tab-min-width);
- transition: min-width 100ms ease-out,
- max-width 100ms ease-out;
}
:root[uidensity=touch] .tabbrowser-tab:not([pinned]) {
@@ -647,12 +647,12 @@ toolbar:not(#TabsToolbar) > #personal-bookmarks {
margin-inline-start: 0;
}
-#urlbar-input-container[pageproxystate=invalid] > #page-action-buttons > .urlbar-page-action,
+#urlbar-input-container[pageproxystate=invalid] > #page-action-buttons > .urlbar-page-action:not(#zen-split-views-box),
#identity-box.chromeUI ~ #page-action-buttons > .urlbar-page-action:not(#star-button-box),
#urlbar[usertyping] > #urlbar-input-container > #page-action-buttons > #urlbar-zoom-button,
#urlbar:not([usertyping]) > #urlbar-input-container > #urlbar-go-button,
#urlbar:not([focused]) > #urlbar-input-container > #urlbar-go-button {
- display: none;
+ display: none !important;
}
#nav-bar:not([keyNav=true]) #identity-box,
@@ -1237,13 +1237,13 @@ printpreview-pagination:focus-within,
panelmultiview {
@@ -566,9 +568,9 @@ printpreview-pagination:focus-within,
#sidebar-box {
@ -47,15 +23,11 @@ index 6e776a9ce7c525e510b6466065daf755b21567a4..8668b27ec2126ed772a11aa77809b6f2
}
/* WebExtension Sidebars */
-#sidebar-box[sidebarcommand$="-sidebar-action"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon {
+#sidebar-box[sidebarcommand$="-sidebar-action"] #sidebar-header > #sidebar-switcher-target > #sidebar-icon {
list-style-image: var(--webextension-menuitem-image, inherit);
-moz-context-properties: fill;
fill: currentColor;
@@ -1444,3 +1444,42 @@ toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
/**
* End Dialogs
*/
@@ -583,3 +585,43 @@ printpreview-pagination:focus-within,
toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
-moz-user-focus: normal;
}
+
+
+/**
+ *

26
src/browser/base/content/browser-init-js.patch
View file

@ -1,33 +1,13 @@
diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
index 0717ce21386b73fc3399c97b34c6892a674cca77..f20e8a43fdd1d885f917948a26f1c3a1bd917707 100644
index a79a9734619f89639c15087fe28e9615354a7209..212628c6fb2bed5ba17a3d2908f5d4b2376fa95e 100644
--- a/browser/base/content/browser-init.js
+++ b/browser/base/content/browser-init.js
@@ -230,6 +230,12 @@ var gBrowserInit = {
@@ -230,6 +230,8 @@ 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})`);
+}

15
src/browser/base/content/zenThemeModifier.js
View file

@ -95,6 +95,7 @@
_zenInitBrowserLayout() {
if (!this._inMainBrowserWindow) return;
console.log("ZenThemeModifier: init browser layout");
const kNavbarItems = [
"nav-bar",
"PersonalToolbar",
@ -116,7 +117,19 @@
// move the security button to the right
const securityButton = document.getElementById("tracking-protection-icon-container");
document.getElementById("urlbar-input-container").insertBefore(securityButton, document.getElementById("page-action-buttons"));
document.getElementsByClassName("urlbar-input-container")[0].insertBefore(securityButton, document.getElementById("page-action-buttons"));
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
console.log("ZenThemeModifier: setting avatar image to", profile.zenAvatarPath);
mainWindowEl.style.setProperty("--zen-avatar-image-url", `url(${profile.zenAvatarPath})`);
mainWindowEl.style.setProperty("--avatar-image-url", `var(--zen-avatar-image-url)`, "important");
},
};

11
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 5b09402dc1e19e89dcdfc8b5b45a2004c8cec0e6..0f8d774c728087b96242f35fe038e1fef55e58b3 100644
index f466105b8290b13c672351bb68dd92644dd670fe..7861d98a3679d7d81ea2076bb31d2c49425e7854 100644
--- a/browser/components/customizableui/CustomizableUI.sys.mjs
+++ b/browser/components/customizableui/CustomizableUI.sys.mjs
@@ -25,7 +25,7 @@ ChromeUtils.defineLazyGetter(lazy, "gWidgetsBundle", function () {
@ -11,10 +11,10 @@ index 5b09402dc1e19e89dcdfc8b5b45a2004c8cec0e6..0f8d774c728087b96242f35fe038e1fe
const kSpecialWidgetPfx = "customizableui-special-";
@@ -249,14 +249,11 @@ var CustomizableUIInternal = {
Services.policies.isAllowed("removeHomeButtonByDefault")
@@ -250,13 +250,10 @@ var CustomizableUIInternal = {
? null
: "home-button",
Services.prefs.getBoolPref("sidebar.revamp") ? "sidebar-button" : null,
- "spring",
"urlbar-container",
- "spring",
@ -22,12 +22,11 @@ index 5b09402dc1e19e89dcdfc8b5b45a2004c8cec0e6..0f8d774c728087b96242f35fe038e1fe
"downloads-button",
AppConstants.MOZ_DEV_EDITION ? "developer-button" : null,
- "fxa-toolbar-menu-button",
lazy.resetPBMToolbarButtonEnabled ? "reset-pbm-toolbar-button" : null,
+ "wrapper-sidebar-button",
lazy.resetPBMToolbarButtonEnabled ? "reset-pbm-toolbar-button" : null,
].filter(name => name);
this.registerArea(
@@ -287,7 +284,7 @@ var CustomizableUIInternal = {
@@ -288,7 +285,7 @@ var CustomizableUIInternal = {
{
type: CustomizableUI.TYPE_TOOLBAR,
defaultPlacements: [

16
src/browser/components/moz-build.patch
View file

@ -1,14 +1,12 @@
diff --git a/browser/components/moz.build b/browser/components/moz.build
index 0f91b90fb0ce4eac232d71ad4f9ff82ab7316635..82aa7bb8bd41b061ac861d3fbabbf9f9879a2091 100644
index 6cbb7ce0037c1457eeae5c331a996719691ebd6b..611707852198740c9b4103f5e2a66e8ee4099a21 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -72,6 +72,9 @@ DIRS += [
"urlbar",
]
+# Zen Components:
+DIRS += ["zen-welcome"]
+
DIRS += ["build"]
@@ -27,6 +27,7 @@ with Files("controlcenter/**"):
DIRS += [
+ "zen-welcome",
"about",
"aboutlogins",
"aboutwelcome",

13
src/browser/components/newtab/content-src/styles/_theme-scss.patch
View file

@ -1,13 +0,0 @@
diff --git a/browser/components/newtab/content-src/styles/_theme.scss b/browser/components/newtab/content-src/styles/_theme.scss
index 6b097ae93edc046fb82dc843357e4ce8f34aca60..a76a3d8082d611a5169b0e85053aaca05a59ede1 100644
--- a/browser/components/newtab/content-src/styles/_theme.scss
+++ b/browser/components/newtab/content-src/styles/_theme.scss
@@ -25,7 +25,7 @@ $shadow-image-inset: inset 0 0 0 0.5px $black-15;
// Default theme
:root {
// General styles
- --newtab-background-color: #{$in-content-page-background};
+ --newtab-background-color: var(--zen-colors-tertiary);
--newtab-background-color-secondary: #{$newtab-background-secondary};
--newtab-text-primary-color: #{$in-content-page-color};
--newtab-primary-action-background: #{$primary-blue};

13
src/browser/components/tabbrowser/content/tab-hover-preview-mjs.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/browser/components/tabbrowser/content/tab-hover-preview.mjs b/browser/components/tabbrowser/content/tab-hover-preview.mjs
index b07dba3e060dd730e603997b2c374f218a1eb591..412d35a263d1e6a789927206a506c184a5ac0d46 100644
--- a/browser/components/tabbrowser/content/tab-hover-preview.mjs
+++ b/browser/components/tabbrowser/content/tab-hover-preview.mjs
@@ -7,7 +7,7 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
);
const POPUP_OPTIONS = {
- position: "bottomleft topleft",
+ position: "topright topleft",
x: 0,
y: -2,
};

6
src/browser/base/content/tabbrowser-js.patch → src/browser/components/tabbrowser/content/tabbrowser-js.patch
View file

@ -1,7 +1,7 @@
diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
index 3bca0b6d30468dc3a755219723f673ec80dfce6e..200a609ea31a8c904e2d3e39a3a06ff67fb313ed 100644
--- a/browser/base/content/tabbrowser.js
+++ b/browser/base/content/tabbrowser.js
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -7623,6 +7623,11 @@ var TabContextMenu = {
this.contextTab.linkedBrowser,
document.getElementById("context_sendTabToDevice")

6
src/browser/base/content/tabbrowser-tabs-js.patch → src/browser/components/tabbrowser/content/tabs-js.patch
View file

@ -1,7 +1,7 @@
diff --git a/browser/base/content/tabbrowser-tabs.js b/browser/base/content/tabbrowser-tabs.js
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c992624170bde0e63 100644
--- a/browser/base/content/tabbrowser-tabs.js
+++ b/browser/base/content/tabbrowser-tabs.js
--- a/browser/components/tabbrowser/content/tabs.js
+++ b/browser/components/tabbrowser/content/tabs.js
@@ -538,19 +538,36 @@
}
dt.setDragImage(toDrag, dragImageOffset, dragImageOffset);

13
src/browser/components/tabpreview/tab-preview-panel-mjs.patch
View file

@ -1,13 +0,0 @@
diff --git a/browser/components/tabpreview/tab-preview-panel.mjs b/browser/components/tabpreview/tab-preview-panel.mjs
index 683b2c17ec893a97680d885c622029591dda7f29..605f8682368d691f7cc18dfb1775fa2622006ebd 100644
--- a/browser/components/tabpreview/tab-preview-panel.mjs
+++ b/browser/components/tabpreview/tab-preview-panel.mjs
@@ -7,7 +7,7 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
);
const POPUP_OPTIONS = {
- position: "bottomleft topleft",
+ position: "topright topleft",
x: 0,
y: -2,
};

4
src/browser/components/zen-welcome/welcome.html
View file

@ -8,10 +8,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
<html lang="en">
<head>
<meta name="color-scheme" content="light dark">
<meta
http-equiv="Content-Security-Policy"
content="default-src chrome:; object-src 'none'"
/>
<meta name="referrer" content="no-referrer" />
<link

8
src/browser/components/zen-welcome/welcome.js
View file

@ -246,8 +246,8 @@ class Search extends Page {
const searchElements = document.getElementById('searchList')
this.store.getEngine().forEach((search) => {
const container = this.loadSpecificSearch(search, defaultEngine)
this.store.getEngine().forEach(async (search) => {
const container = await this.loadSpecificSearch(search, defaultEngine)
searchElements.appendChild(container)
this.searchList.push(container)
@ -257,7 +257,7 @@ class Search extends Page {
/**
* @returns {HTMLDivElement}
*/
loadSpecificSearch(search, defaultSearch) {
async loadSpecificSearch(search, defaultSearch) {
const container = document.createElement('div');
container.classList.add('card')
container.classList.add('card-no-hover')
@ -273,7 +273,7 @@ class Search extends Page {
})
const img = document.createElement('img');
img.src = search.originalEngine._iconURI.spec;
img.src = await search.originalEngine.getIconURL();
const name = document.createElement('h3')
name.textContent = search.name

6
src/browser/modules/AsyncTabSwitcher-sys-mjs.patch
View file

@ -1,7 +1,7 @@
diff --git a/browser/modules/AsyncTabSwitcher.sys.mjs b/browser/modules/AsyncTabSwitcher.sys.mjs
diff --git a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
index 9f4aa535e07adab496788165f4089be6732b1444..7b7955c0d1f2f3277cb750652458649d181e90e5 100644
--- a/browser/modules/AsyncTabSwitcher.sys.mjs
+++ b/browser/modules/AsyncTabSwitcher.sys.mjs
--- a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
+++ b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
@@ -39,6 +39,10 @@ XPCOMUtils.defineLazyPreferenceGetter(
300
);

31
src/browser/themes/addons/dark/manifest-json.patch
View file

@ -1,5 +1,5 @@
diff --git a/browser/themes/addons/dark/manifest.json b/browser/themes/addons/dark/manifest.json
index 544986d5e93c033f944cf301af79e0750864a32c..41b15b8d1e1bb146ef0cf8357ab08d443f88b235 100644
index bfebde683d00b0acf26509139a0f662029d37c72..976b553f49e40b7ed02743d79ccc102fccffcf6f 100644
--- a/browser/themes/addons/dark/manifest.json
+++ b/browser/themes/addons/dark/manifest.json
@@ -7,10 +7,10 @@
@ -16,32 +16,7 @@ index 544986d5e93c033f944cf301af79e0750864a32c..41b15b8d1e1bb146ef0cf8357ab08d44
"icons": { "32": "icon.svg" },
@@ -38,19 +38,18 @@
"ntp_background": "rgb(43, 42, 51)",
"ntp_card_background": "rgb(66,65,77)",
"ntp_text": "rgb(251, 251, 254)",
- "sidebar": "#38383D",
"sidebar_text": "rgb(249, 249, 250)",
"sidebar_border": "rgba(255, 255, 255, 0.1)",
"button": "rgba(0, 0, 0, .33)",
"button_hover": "rgba(207, 207, 216, .20)",
"button_active": "rgba(207, 207, 216, .40)",
- "button_primary": "rgb(0, 221, 255)",
- "button_primary_hover": "rgb(128, 235, 255)",
- "button_primary_active": "rgb(170, 242, 255)",
- "button_primary_color": "rgb(43, 42, 51)",
+ "button_primary": "#fff",
+ "button_primary_hover": "rgb(207, 207, 216)",
+ "button_primary_active": "rgb(207, 207, 216)",
+ "button_primary_color": "#000",
"input_background": "#42414D",
"input_color": "rgb(251,251,254)",
- "input_border": "#8f8f9d",
+ "input_border": "#fff",
"urlbar_popup_separator": "rgb(82,82,94)",
"appmenu_update_icon_color": "#54FFBD",
"appmenu_info_icon_color": "#80EBFF",
@@ -61,7 +60,8 @@
@@ -58,7 +58,8 @@
"color_scheme": "dark",
"panel_active": "color-mix(in srgb, currentColor 14%, transparent)",
"toolbar_field_icon_opacity": "1",
@ -51,7 +26,7 @@ index 544986d5e93c033f944cf301af79e0750864a32c..41b15b8d1e1bb146ef0cf8357ab08d44
}
},
@@ -88,7 +88,8 @@
@@ -82,7 +83,8 @@
"properties": {
"panel_active": "--arrowpanel-dimmed-further",
"toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",

33
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
index 7385970fa8e3ff9659b72cfb238003958220fb0d..be4d385cf4520a2cad437225e5fb31335bbc3091 100644
index d490f8f08d203ded55b65fe1a19be105b61ee6c0..eb4349e939b979b3a4d7c525ee0c0f9a53079d4a 100644
--- a/browser/themes/addons/light/manifest.json
+++ b/browser/themes/addons/light/manifest.json
@@ -7,10 +7,10 @@
@ -16,45 +16,20 @@ index 7385970fa8e3ff9659b72cfb238003958220fb0d..be4d385cf4520a2cad437225e5fb3133
"icons": { "32": "icon.svg" },
@@ -42,12 +42,12 @@
"button": "rgba(207,207,216,.33)",
"button_hover": "rgba(207,207,216,.66)",
"button_active": "rgb(207,207,216)",
- "button_primary": "rgb(0, 97, 224)",
- "button_primary_hover": "rgb(2, 80, 187)",
- "button_primary_active": "rgb(5, 62, 148)",
- "button_primary_color": "rgb(251, 251, 254)",
+ "button_primary": "#000",
+ "button_primary_hover": "rgb(31, 31, 31)",
+ "button_primary_active": "rgb(207,207,216)",
+ "button_primary_color": "#fff",
"input_color": "rgb(21,20,26)",
- "input_background": "rgb(255,255,255)",
+ "input_background": "#f0f0f4",
"urlbar_popup_hover": "rgb(240,240,244)",
"urlbar_popup_separator": "rgb(240,240,244)",
"appmenu_update_icon_color": "#2AC3A2",
@@ -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)",
@@ -59,7 +59,8 @@
"panel_active": "color-mix(in srgb, currentColor 20%, transparent)",
"panel_active_darker": "color-mix(in srgb, currentColor 27%, transparent)",
"toolbar_field_icon_opacity": "0.72",
- "input_border_color": "color-mix(in srgb, currentColor 41%, transparent)",
- "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)"
+ "input_border_color": "rgba(0, 0, 0, .3)",
+ "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
+ "zen_main_browser_background": "var(--zen-themed-toolbar-bg)"
}
},
@@ -93,7 +94,8 @@
@@ -86,7 +87,8 @@
"panel_active": "--arrowpanel-dimmed-further",
"panel_active_darker": "--panel-item-active-bgcolor",
"toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",
"input_border_color": "--input-border-color",
- "zap_gradient": "--panel-separator-zap-gradient"
+ "zap_gradient": "--panel-separator-zap-gradient",
+ "zen_main_browser_background": "--zen-main-browser-background"

23
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
index 9e513830a9d9eeebe55cf6ab565b0575a943b088..05c8b716c0642f0ecebc47fe2759bc43474b6391 100644
index 61119b7564d37e55f49dab7e6e14faafb4baa298..bcaad1a231cc839579ed209307c8e95cfb4c37de 100644
--- a/browser/themes/shared/browser-shared.css
+++ b/browser/themes/shared/browser-shared.css
@@ -25,6 +25,8 @@
@@ -27,6 +27,8 @@
@import url("chrome://browser/skin/UITour.css");
@import url("chrome://browser/skin/formautofill-notification.css");
@ -10,8 +10,8 @@ index 9e513830a9d9eeebe55cf6ab565b0575a943b088..05c8b716c0642f0ecebc47fe2759bc43
+
@namespace html url("http://www.w3.org/1999/xhtml");
:root {
@@ -49,7 +51,7 @@
:root,
@@ -75,7 +77,7 @@ body {
--short-notification-gradient: #9059FF;
--button-bgcolor: color-mix(in srgb, currentColor 13%, transparent);
@ -20,23 +20,25 @@ index 9e513830a9d9eeebe55cf6ab565b0575a943b088..05c8b716c0642f0ecebc47fe2759bc43
--button-active-bgcolor: color-mix(in srgb, currentColor 30%, transparent);
--button-color: currentColor;
--button-primary-bgcolor: AccentColor;
@@ -145,9 +147,6 @@
#navigator-toolbox {
@@ -181,7 +183,6 @@ body {
appearance: none;
- /* Toolbar / content area border */
/* Toolbar / content area border */
- border-bottom: 0.01px solid var(--chrome-content-separator-color);
-
background-color: var(--toolbox-non-lwt-bgcolor);
color: var(--toolbox-non-lwt-textcolor);
@@ -155,33 +154,8 @@
@@ -190,37 +191,13 @@ body {
transition: background-color var(--inactive-window-transition);
&:-moz-window-inactive {
- background-color: var(--toolbox-non-lwt-bgcolor-inactive);
color: var(--toolbox-non-lwt-textcolor-inactive);
}
&[fullscreenShouldAnimate] {
transition: 0.8s margin-top ease-out;
}
-
- :root[customizing] & {
- border-bottom-style: none;
@ -61,6 +63,7 @@ index 9e513830a9d9eeebe55cf6ab565b0575a943b088..05c8b716c0642f0ecebc47fe2759bc43
- background-repeat: no-repeat, var(--lwt-background-tiling);
- background-position: right top, var(--lwt-background-alignment);
- }
+
}
.browser-toolbar {

12
src/browser/themes/shared/customizableui/panelUI-shared-css.patch
View file

@ -1,8 +1,8 @@
diff --git a/browser/themes/shared/customizableui/panelUI-shared.css b/browser/themes/shared/customizableui/panelUI-shared.css
index 4f282b9d5a5a3269268ae22f1702c7a6e8238375..d6e8e6cee7166f0eea99f260cca382eeece6684d 100644
index e4409ac75f6ee794d400559b0b01ae30904d01bc..44d4e648aa5aac17b82e0e1f80c7a953c2923ebc 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
@@ -720,15 +720,15 @@ toolbarbutton[constrain-size="true"][cui-areatype="panel"] > .toolbarbutton-badg
/* Firefox Account Toolbar Panel */
#fxa-avatar-image {
@ -13,3 +13,11 @@ index 4f282b9d5a5a3269268ae22f1702c7a6e8238375..d6e8e6cee7166f0eea99f260cca382ee
}
:root {
--avatar-image-url: url(chrome://browser/skin/fxa/avatar.svg);
&[fxastatus="not_configured"] {
- --avatar-image-url: url(chrome://browser/skin/fxa/avatar-empty.svg);
+ --avatar-image-url: var(--zen-avatar-image-url);
}
&:not([fxatoolbarmenu]) #fxa-toolbar-menu-button {

22
src/browser/themes/shared/identity-block/identity-block-css.patch
View file

@ -1,17 +1,29 @@
diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css
index 39cf7c917aa8807d491cc6a3702e398569681022..6e6942d97596540b0823c7934062ad2d63fa415c 100644
index 39ae2b00791a7bfd875961de60736612f08892ae..03fe5e42f34ad985f0e04ef46b834a9d223585ee 100644
--- a/browser/themes/shared/identity-block/identity-block.css
+++ b/browser/themes/shared/identity-block/identity-block.css
@@ -65,10 +65,10 @@
@@ -64,8 +64,9 @@
}
#identity-box[pageproxystate="valid"].notSecureText > .identity-box-button,
-#identity-box[pageproxystate="valid"].chromeUI > .identity-box-button,
#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button,
+#identity-box[pageproxystate="valid"] > .identity-box-button,
#identity-box[pageproxystate="valid"].extensionPage > .identity-box-button,
#urlbar-label-box {
- background-color: var(--urlbar-box-bgcolor);
+ background-color: light-dark(white, rgb(66, 65, 77));
color: var(--urlbar-box-text-color);
padding-inline: 8px;
border-radius: var(--urlbar-icon-border-radius);
@@ -154,11 +155,11 @@
}
#urlbar:not(.searchButton) > .urlbar-input-container > #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;
}
#urlbar[actiontype="extension"] > .urlbar-input-container > #identity-box #identity-icon {
- list-style-image: url(chrome://mozapps/skin/extensions/extension.svg);
+ list-style-image: url(chrome://mozapps/skin/extensions/extension.svg) !important;
}
#identity-box[pageproxystate="valid"].extensionPage #identity-icon {

13
src/browser/components/tabpreview/tabpreview-css.patch → src/browser/themes/shared/tabbrowser/tab-hover-preview-css.patch
View file

@ -1,9 +1,9 @@
diff --git a/browser/components/tabpreview/tabpreview.css b/browser/components/tabpreview/tabpreview.css
index e978266e5da72f3051d5455d7a3f2867a88648c5..c57e844107ea6e99b406422496e9b41511089594 100644
--- a/browser/components/tabpreview/tabpreview.css
+++ b/browser/components/tabpreview/tabpreview.css
@@ -42,3 +42,24 @@
width: 100%;
diff --git a/browser/themes/shared/tabbrowser/tab-hover-preview.css b/browser/themes/shared/tabbrowser/tab-hover-preview.css
index 5df2561b9f0e5497a596e4e261ceaac30778e754..cbea9912e7ae15f7a277ecbdcd681cc4e7a4da72 100644
--- a/browser/themes/shared/tabbrowser/tab-hover-preview.css
+++ b/browser/themes/shared/tabbrowser/tab-hover-preview.css
@@ -44,3 +44,24 @@
display: block;
}
}
+
@ -27,4 +27,3 @@ index e978266e5da72f3051d5455d7a3f2867a88648c5..c57e844107ea6e99b406422496e9b415
+.tab-preview-thumbnail-container canvas {
+ border-top: 1px solid var(--zen-border-color);
+}
\ No newline at end of file

6
src/browser/themes/shared/tabs-css.patch → src/browser/themes/shared/tabbrowser/tabs-css.patch
View file

@ -1,7 +1,7 @@
diff --git a/browser/themes/shared/tabs.css b/browser/themes/shared/tabs.css
diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
index eb92f71e5942a19618fd74492354de78ac03bacf..28d23667991c9feff7a379acaa5f7c7928fb14cf 100644
--- a/browser/themes/shared/tabs.css
+++ b/browser/themes/shared/tabs.css
--- a/browser/themes/shared/tabbrowser/tabs.css
+++ b/browser/themes/shared/tabbrowser/tabs.css
@@ -67,7 +67,7 @@
#tabbrowser-tabs {

28
src/browser/themes/shared/urlbar-searchbar-css.patch
View file

@ -1,22 +1,12 @@
diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
index b5684c5f6f4b932070ef2bc53750504791f7f3c3..c3ffdb99adbb4a331967b93181d536dad1a41488 100644
index 41798f42cfb365116926af97a070dce3ebf6e443..75d1cda0c7938ba36f694e0f770db1820acd01ca 100644
--- a/browser/themes/shared/urlbar-searchbar.css
+++ b/browser/themes/shared/urlbar-searchbar.css
@@ -59,7 +59,7 @@
#urlbar-background,
#searchbar {
- background-color: var(--toolbar-field-background-color);
+ background-color: var(--zen-urlbar-background);
background-clip: border-box;
border: 1px solid var(--toolbar-field-border-color);
border-radius: var(--toolbarbutton-border-radius);
@@ -92,7 +92,7 @@
--toolbar-field-focus-border-color is set equal to --focus-outline-color
on :root, but LWT themes can override this value. */
outline-color: var(--toolbar-field-focus-border-color);
- border-color: transparent;
+ /*border-color: transparent;*/
}
#urlbar[focused="true"] > #urlbar-background,
@@ -19,6 +19,7 @@
#urlbar[breakout-extend] > .urlbar-input-container > #urlbar-label-box > #urlbar-label-search-mode,
.urlbar-input-container[pageproxystate=invalid] > #page-action-buttons > .urlbar-page-action,
#identity-box.chromeUI ~ #page-action-buttons > .urlbar-page-action:not(#star-button-box),
+#urlbar-input-container[pageproxystate=invalid] > #page-action-buttons > .urlbar-page-action:not(#zen-split-views-box),
#urlbar[usertyping] > .urlbar-input-container > #page-action-buttons > #urlbar-zoom-button,
#urlbar:not([usertyping]) > .urlbar-input-container > .urlbar-go-button,
#urlbar:not([focused]) > .urlbar-input-container > .urlbar-go-button {

8
src/browser/themes/shared/zen-browser-shared.css
View file

@ -42,9 +42,11 @@
/* URL and tool bars */
#urlbar {
--toolbarbutton-border-radius: 999px;
border: transparent;
overflow: hidden;
padding: 1px;
border-radius: var(--toolbarbutton-border-radius);
}
#zen-website-and-native-separator {
@ -80,12 +82,16 @@
outline-color: none !important;
}
#urlbar, #urlbar .urlbar-page-action,
#urlbar .urlbar-page-action,
#urlbar #tracking-protection-icon-container,
#urlbar:not([extend="true"]) #identity-box:not(.chromeUI) #identity-icon-box {
border-radius: 999px;
}
#urlbar[breakout-extend="true"] {
--toolbarbutton-border-radius: 6px;
}
#identity-icon-label {
padding-inline-start: 8px !important;
}

2
surfer.json
View file

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