Skip to content

Fixed sidebar split screen error. Fix #6972 #10348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
+8 −10
Open

Fixed sidebar split screen error. Fix #6972 #10348

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9538e0
Fixed sidebar split screen error. Fix #6972
SO9010 Sep 13, 2025
c322e53
Re-add zen-appcontent-navbar-wrapper
SO9010 Sep 14, 2025
fdaaac4
Remove unnecessary tabcontainer="tabbrowser-tabs"
SO9010 Sep 18, 2025
bbf2a83
Merge branch 'dev' into fix-#6972-final
SO9010 Sep 18, 2025
2275793
Merge branch 'dev' into fix-#6972-final
SO9010 Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/browser/base/content/browser-box-inc-xhtml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
index afa7f8e7dd74173bf2c696bd96f7e86e8b0126bc..4847c24923f673e91eb7fb65ea6b037f38062405 100644
index 4847c24923f673e91eb7fb65ea6b037f38062405..4847c24923f673e91eb7fb65ea6b037f38062405 100644
--- a/browser/base/content/browser-box.inc.xhtml
+++ b/browser/base/content/browser-box.inc.xhtml
@@ -25,7 +25,15 @@
@@ -25,7 +25,13 @@
</stack>
</vbox>
<splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
+<vbox flex="1" id="zen-appcontent-wrapper">
+ <html:div id="zen-appcontent-navbar-wrapper">
+ <html:div id="zen-appcontent-navbar-container"></html:div>
+ </html:div>
+ <hbox id="zen-tabbox-wrapper" flex="1">
+ <html:div id="zen-appcontent-navbar-container"></html:div>
+ <hbox id="zen-tabbox-wrapper" flex="1" tabcontainer="tabbrowser-tabs">
<tabbox id="tabbrowser-tabbox" flex="1" tabcontainer="tabbrowser-tabs">
+#include zen-tabbrowser-elements.inc.xhtml
<tabpanels id="tabbrowser-tabpanels" flex="1" selectedIndex="0"/>
</tabbox>
</hbox>
+</vbox>
+</hbox>

2 changes: 1 addition & 1 deletion src/zen/common/ZenStartup.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
const browser = document.getElementById('browser');
browser.prepend(gNavToolbox);

const sidebarPanelWrapper = document.getElementById('tabbrowser-tabbox');
const sidebarPanelWrapper = document.getElementById('zen-tabbox-wrapper');
for (let id of kElementsToAppend) {
const elem = document.getElementById(id);
if (elem) {
Expand Down
18 changes: 8 additions & 10 deletions src/zen/common/styles/zen-sidebar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#zen-tabbox-wrapper {
& #sidebar-splitter {
opacity: 0;
margin: 0 calc(-1 * var(--zen-element-separation) + 2px);
margin: 0 calc(-1 * var(--zen-element-separation) + 8px);
}

& #sidebar-box {
Expand All @@ -17,22 +17,20 @@
overflow: hidden;

:root:not([zen-right-side='true']) &[positionend='true'] {
margin-right: var(--zen-element-separation);
margin-right: 0;
}

:root[zen-right-side='true'] & {
margin-left: var(--zen-element-separation);
margin-left: 0;
}
}

& #tabbrowser-tabbox[sidebar-positionend] {
& #sidebar-box {
order: 8 !important;
}
& #sidebar-box[sidebar-positionend] {
order: 8 !important;
}

& #sidebar-splitter {
order: 7 !important;
}
#sidebar-box[sidebar-positionend] + #sidebar-splitter {
order: 7 !important;
}
}

Expand Down