diff --git a/src/browser/components/preferences/preferences-js.patch b/src/browser/components/preferences/preferences-js.patch index e57210221..65a6e8024 100644 --- a/src/browser/components/preferences/preferences-js.patch +++ b/src/browser/components/preferences/preferences-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js -index 57add34d876fb885275f1147209c6fbeee367a7c..d4c64b9ec8b6d1e6e0bd0b888c6e7351fbe299a4 100644 +index 57add34d876fb885275f1147209c6fbeee367a7c..5f4616d5f7d3d077326246e843775f58c293ee48 100644 --- a/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js @@ -132,6 +132,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () { @@ -10,7 +10,25 @@ index 57add34d876fb885275f1147209c6fbeee367a7c..d4c64b9ec8b6d1e6e0bd0b888c6e7351 ], resizeCallback: async ({ title, frame }) => { // Search within main document and highlight matched keyword. -@@ -522,6 +523,10 @@ function init_all() { +@@ -437,6 +438,8 @@ const CONFIG_PANES = Object.freeze({ + tabsBrowsing: { + l10nId: "tabs-browsing-section", + groupIds: [ ++ "defaultBrowserHome", ++ "startupHome", + "browserLayout", + "tabs", + "pageNavigation", +@@ -477,7 +480,7 @@ function register_module(categoryName, categoryObject) { + } + this._initted = true; + let template = document.getElementById("template-" + categoryName); +- if (template && !srdSectionPrefs.all) { ++ if (template && (!srdSectionPrefs.all || categoryName.startsWith("paneZen"))) { + // Replace the template element with the nodes inside of it. + template.replaceWith(template.content); + +@@ -522,6 +525,10 @@ function init_all() { register_module("paneSearch", gSearchPane); register_module("panePrivacy", gPrivacyPane); register_module("paneContainers", gContainersPane); @@ -21,3 +39,12 @@ index 57add34d876fb885275f1147209c6fbeee367a7c..d4c64b9ec8b6d1e6e0bd0b888c6e7351 // Restore the cached Firefox Labs nav button visibility so it shows // immediately when recipes are expected to be available, before +@@ -653,7 +660,7 @@ async function gotoPref( + const kDefaultCategoryInternalName = redesignEnabled + ? "paneSync" + : "paneGeneral"; +- const kDefaultCategory = redesignEnabled ? "sync" : "general"; ++ const kDefaultCategory = redesignEnabled ? "tabsBrowsing" : "general"; + let hash = document.location.hash; + let category = aCategory || hash.substring(1) || kDefaultCategoryInternalName; + diff --git a/src/zen/spaces/zen-workspaces.css b/src/zen/spaces/zen-workspaces.css index 7e69c34df..1acb66c4c 100644 --- a/src/zen/spaces/zen-workspaces.css +++ b/src/zen/spaces/zen-workspaces.css @@ -323,7 +323,7 @@ zen-workspace { overflow: hidden; color: color-mix(in srgb, var(--toolbox-textcolor) 95%, var(--zen-primary-color)); - --tab-selected-bgcolor: color-mix(in srgb, light-dark(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.18)) 95%, var(--zen-primary-color)) !important; + --tab-background-color-selected: color-mix(in srgb, light-dark(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.18)) 95%, var(--zen-primary-color)) !important; --tab-selected-shadow: 0 0.8px 1.5px 0px light-dark(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.05)) !important; --tab-selected-textcolor: color-mix(in srgb, var(--toolbox-textcolor) 95%, var(--zen-primary-color)) !important; diff --git a/src/zen/split-view/zen-split-group.inc.css b/src/zen/split-view/zen-split-group.inc.css index a153d165c..420bfc9b1 100644 --- a/src/zen/split-view/zen-split-group.inc.css +++ b/src/zen/split-view/zen-split-group.inc.css @@ -57,7 +57,7 @@ tab-group[split-view-group] { } & > .tabbrowser-tab { - --tab-selected-bgcolor: var(--zen-split-view-active-tab-bg); + --tab-background-color-selected: var(--zen-split-view-active-tab-bg); --tab-hover-background-color: transparent; --tab-selected-shadow: none; --border-radius-medium: var(--tab-border-radius); @@ -106,7 +106,7 @@ tab-group[split-view-group] { tab-group[split-view-group]:where([hasactivetab]) &, &:has(> tab:is([multiselected])) { - background-color: var(--tab-selected-bgcolor); + background-color: var(--tab-background-color-selected); box-shadow: var(--tab-selected-shadow); & > .tabbrowser-tab { diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css index e7fc083f7..0e5609008 100644 --- a/src/zen/tabs/zen-tabs/vertical-tabs.css +++ b/src/zen/tabs/zen-tabs/vertical-tabs.css @@ -1084,7 +1084,7 @@ } &[in-urlbar] { - background: var(--tab-selected-bgcolor) !important; + background: var(--tab-background-color-selected) !important; box-shadow: var(--tab-selected-shadow); } } @@ -1172,7 +1172,7 @@ border-radius: var(--border-radius-medium) !important; } - --tab-selected-bgcolor: light-dark(rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.2)); + --tab-background-color-selected: light-dark(rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.2)); &:not([visuallyselected], [multiselected="true"]) .tab-background { background: var(--zen-toolbar-element-bg); @@ -1195,7 +1195,7 @@ } &:hover .tab-background { - background: light-dark(rgba(0, 0, 0, 0.1), var(--tab-selected-bgcolor)); + background: light-dark(rgba(0, 0, 0, 0.1), var(--tab-background-color-selected)); } /* stylelint-disable-next-line media-query-no-invalid */