From 43e5b07bf4a27e2f5d996df9a2b25f8d752bf912 Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sun, 21 Apr 2024 14:25:25 +0200 Subject: [PATCH] Changed UI for preferences page (#14) --- src/browser/base/content/zenThemeModifier.js | 32 +++-- .../preferences/preferences-xhtml.patch | 44 ++++++- .../shared/preferences/preferences-css.patch | 13 ++ .../shared/preferences/zen-preferences.css | 119 +++++++++++++++++- .../themes/shared/zen-browser-shared.css | 2 +- src/browser/themes/shared/zen-sidebar.css | 4 + .../shared/in-content/common-shared-css.patch | 11 +- 7 files changed, 206 insertions(+), 19 deletions(-) create mode 100644 src/browser/themes/shared/preferences/preferences-css.patch diff --git a/src/browser/base/content/zenThemeModifier.js b/src/browser/base/content/zenThemeModifier.js index 51374a3f7..e1afd60ba 100644 --- a/src/browser/base/content/zenThemeModifier.js +++ b/src/browser/base/content/zenThemeModifier.js @@ -86,20 +86,26 @@ }, _changeSidebarLocation(value) { + const kElementsToAppend = [ + "sidebar-splitter", + "sidebar-box", + "navigator-toolbox", + ]; const kInlineIndicatorElements = [ "nav-bar", - "tabbrowser-tabbox" - ] - const sidebar = document.getElementById("sidebar-box"); - const toolbox = document.getElementById("navigator-toolbox"); + "tabbrowser-tabbox", + ...kElementsToAppend, + ]; const wrapper = document.getElementById("zen-tabbox-wrapper"); const appWrapepr = document.getElementById("zen-sidebar-box-container"); if (value <= 0) { - wrapper.prepend(sidebar); - wrapper.prepend(toolbox); + for (let id of kElementsToAppend) { + const elem = document.getElementById(id); + if (elem) { + wrapper.prepend(elem); + } + } appWrapepr.setAttribute("hidden", "true"); - sidebar.setAttribute("inlinedwithtoolbox", "true"); - toolbox.setAttribute("inlinedwithsidebar", "true"); for (let id of kInlineIndicatorElements) { const elem = document.getElementById(id); if (elem) { @@ -107,11 +113,13 @@ } } } else { - appWrapepr.appendChild(toolbox); - appWrapepr.appendChild(sidebar); + for (let i = kElementsToAppend.length - 1; i >= 0; i--) { + const elem = document.getElementById(kElementsToAppend[i]); + if (elem) { + wrapper.appendChild(elem); + } + } appWrapepr.removeAttribute("hidden"); - sidebar.removeAttribute("inlinedwithtoolbox"); - toolbox.removeAttribute("inlinedwithsidebar"); for (let id of kInlineIndicatorElements) { const elem = document.getElementById(id); if (elem) { diff --git a/src/browser/components/preferences/preferences-xhtml.patch b/src/browser/components/preferences/preferences-xhtml.patch index 011008e60..4ea415601 100644 --- a/src/browser/components/preferences/preferences-xhtml.patch +++ b/src/browser/components/preferences/preferences-xhtml.patch @@ -1,7 +1,16 @@ diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml -index eee227822a772bec128d6adbe4f6aca90ed810f6..54d0f2df0c422a7d8ae0fbe10ef6c072bd7d6453 100644 +index eee227822a772bec128d6adbe4f6aca90ed810f6..dbe59dc683c157fda716033da8a402f7d4435d19 100644 --- a/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml +@@ -12,7 +12,7 @@ + + + +- ++ + + + @@ -43,6 +43,8 @@ /> @@ -11,7 +20,20 @@ index eee227822a772bec128d6adbe4f6aca90ed810f6..54d0f2df0c422a7d8ae0fbe10ef6c072 -@@ -112,6 +114,17 @@ +@@ -99,6 +101,12 @@ + + + ++