Skip to content

Commit 71558dc

Browse files
committed
fix: Fixed sidebar not appearing from the right side on linux, b=(no-bug), c=common, compact-mode
1 parent 6dbc5bf commit 71558dc

File tree

3 files changed

+12
-37
lines changed

3 files changed

+12
-37
lines changed

src/build/moz-configure/init-configure.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/zen/common/ZenUIManager.mjs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,6 @@ var gZenUIManager = {
277277
await new Promise((resolve) => setTimeout(resolve, 10));
278278

279279
document.getElementById('Browser:OpenLocation').doCommand();
280-
281-
// Wait for URL bar to be ready
282-
await new Promise((resolve) => setTimeout(resolve, 10));
283-
284280
gURLBar.search(this._lastSearch || '');
285281
} catch (e) {
286282
console.error('Error opening location in new tab:', e);

src/zen/compact-mode/zen-compact-mode.css

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@
55
*/
66
/* All overrides for compact mode go here */
77

8-
:root {
9-
--zen-compact-mode-offset: 0.1px;
10-
11-
@media not (-moz-platform: macos) {
12-
&[sizemode='maximized'][zen-right-side='true'] {
13-
--zen-compact-mode-offset: 1px;
14-
}
15-
}
16-
}
17-
188
:root[zen-compact-mode='true']:not([customizing]):not([inDOMFullscreen='true']) {
199
%include ../tabs/zen-tabs/vertical-tabs-topbuttons-fix.css
2010
@media -moz-pref('zen.view.compact.hide-tabbar') or -moz-pref('zen.view.use-single-toolbar') {
@@ -54,11 +44,15 @@
5444

5545
#navigator-toolbox {
5646
--zen-toolbox-max-width: 48px !important;
57-
--zen-compact-float: var(--zen-element-separation);
47+
--zen-compact-float: max(var(--zen-element-separation), 4px);
5848

5949
/* Initial padding for when we are animating */
6050
padding: 0 0 0 var(--zen-toolbox-padding) !important;
6151

52+
& #urlbar {
53+
visibility: visible;
54+
}
55+
6256
&:not([animate='true']) {
6357
position: fixed;
6458
z-index: 10;
@@ -69,7 +63,6 @@
6963
top: 0;
7064
bottom: var(--zen-element-separation);
7165
padding: 0 var(--zen-compact-float) !important;
72-
visibility: hidden;
7366

7467
:root[zen-single-toolbar='true'] & {
7568
top: calc(var(--zen-element-separation) / 2);
@@ -125,6 +118,8 @@
125118
outline-offset: -1px;
126119
min-width: var(--zen-toolbox-min-width);
127120
box-shadow: var(--zen-big-shadow);
121+
transition: visibility 0.15s; /* Same as the toolbox */
122+
visibility: hidden;
128123

129124
:root[zen-sidebar-expanded='true'] & {
130125
width: calc(var(--zen-sidebar-width) + var(--zen-toolbox-padding));
@@ -144,11 +139,6 @@
144139
* https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_display/Containing_block#identifying_the_containing_block */
145140
}
146141

147-
& #urlbar[open][zen-floating-urlbar='true'] {
148-
transition: left 0.05s ease;
149-
visibility: visible;
150-
}
151-
152142
&::before {
153143
content: '';
154144
position: absolute;
@@ -175,8 +165,6 @@
175165
#navigator-toolbox:has(
176166
*:is([panelopen='true'], [open='true'], #urlbar:focus-within):not(#urlbar[zen-floating-urlbar='true']):not(tab):not(.zen-compact-mode-ignore)
177167
) {
178-
visibility: visible;
179-
180168
&:not([animate='true']) {
181169
--zen-compact-mode-func: linear(
182170
0 0%,
@@ -291,6 +279,11 @@
291279
right var(--zen-compact-mode-time) var(--zen-compact-mode-func);
292280

293281
&:not([supress-primary-adjustment='true']) {
282+
& #titlebar {
283+
transition: none;
284+
visibility: visible;
285+
}
286+
294287
left: calc(var(--zen-element-separation) / -2);
295288
:root[zen-right-side='true'] & {
296289
right: calc(var(--zen-element-separation) / -2);

0 commit comments

Comments
 (0)