Skip to content

Commit cbf2735

Browse files
Aris-t2Aris-t2
committed
4.6.6
1 parent a2a8f68 commit cbf2735

10 files changed

+129
-130
lines changed

‎current/css/appbutton/appbutton_in_titlebar.css‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,43 @@
77
/* cheat main menu button into title bar ********/
88
/************************************************/
99

10+
:root {
11+
--appbutton_in_titlebar: 95px !important;
12+
}
13+
1014
/* menubar adjustments */
1115
#main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar {
12-
padding-inline-start: 95px !important;
16+
padding-inline-start: var(--appbutton_in_titlebar) !important;
1317
}
14-
1518
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar {
16-
padding-inline-start: 94px !important;
19+
padding-inline-start: var(--appbutton_in_titlebar) !important;
1720
}
18-
1921
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar {
20-
padding-inline-start: 93px !important;
22+
padding-inline-start: var(--appbutton_in_titlebar) !important;
2123
}
22-
2324
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar {
24-
padding-inline-start: 92px !important;
25+
padding-inline-start: var(--appbutton_in_titlebar) !important;
2526
}
2627

2728
/* tabs toolbar adjustments */
2829
#main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
29-
padding-inline-start: 95px !important;
30+
padding-inline-start: var(--appbutton_in_titlebar) !important;
3031
}
3132

3233
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
33-
padding-inline-start: 94px !important;
34+
padding-inline-start: var(--appbutton_in_titlebar) !important;
3435
}
3536

3637
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
37-
padding-inline-start: 93px !important;
38+
padding-inline-start: var(--appbutton_in_titlebar) !important;
3839
}
3940

4041
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
41-
padding-inline-start: 92px !important;
42+
padding-inline-start: var(--appbutton_in_titlebar) !important;
4243
}
4344

4445
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #TabsToolbar {
45-
padding-inline-start: 95px !important;
46+
padding-inline-start: var(--appbutton_in_titlebar) !important;
4647
}
4748

4849
#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]) #toolbar-menubar[autohide="true"]:not([inactive="true"]) ~ #TabsToolbar,
@@ -65,17 +66,16 @@
6566
top: 0px !important;
6667
}
6768

68-
6969
/* code for macOS/Linux */
7070

7171
@media not (-moz-platform: windows) {
7272
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #PanelUI-button {
73-
top: 0px !important;
73+
top: 0 !important;
7474
}
7575
}
7676

7777
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #PanelUI-button {
78-
top: 0px !important;
78+
top: 0 !important;
7979
}
8080

8181
#main-window:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button {
@@ -94,11 +94,10 @@
9494
}
9595

9696
/* code for macOS/Linux */
97-
9897
@media not (-moz-platform: windows) {
9998
#main-window:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button {
100-
max-width: 90px !important;
101-
}
99+
max-width: var(--appbutton_in_titlebar) !important;
100+
}
102101
}
103102

104103
/* hide button in fullscreen mode, if toolbars get automatically hidden */
@@ -158,11 +157,12 @@
158157
/* adjust button badge stack */
159158
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([checked],[open],:active) > .toolbarbutton-badge-stack,
160159
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true],[checked],[open],:active):hover > .toolbarbutton-badge-stack,
161-
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack{
160+
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
162161
background: unset !important;
163162
border-color: unset !important;
164163
border: 0 !important;
165164
box-shadow: unset !important;
165+
outline: unset !important;
166166
}
167167

168168
/* adjust button badge */
@@ -240,6 +240,7 @@
240240
padding: 6px !important;
241241
width: 9px !important;
242242
height: 7px !important;
243+
outline: unset !important;
243244
}
244245

245246
/* fix for toolbar + text mode */
@@ -269,7 +270,7 @@
269270

270271
/* support for tab title in Firefox titlebar option*/
271272
#main-window:is([tabsintitlebar],[customtitlebar])::after {
272-
margin-inline-start: 95px !important;
273+
margin-inline-start: var(--appbutton_in_titlebar) !important;
273274
}
274275

275276
/* remove this nonsense button, a menuitem is inside menu button anyways */
@@ -331,7 +332,7 @@ panel[id="appMenu-popup"][type="arrow"][side="bottom"] {
331332
}
332333

333334
#main-window:is([tabsintitlebar],[customtitlebar]) #TabsToolbar {
334-
padding-inline-end: 100px !important;
335+
padding-inline-end: calc(var(--appbutton_in_titlebar) + 5px) !important;
335336
}
336337

337338
#main-window:is([tabsintitlebar],[customtitlebar]) .titlebar-buttonbox-container {

‎current/css/appbutton/appbutton_in_titlebar_icon_only.css‎

Lines changed: 52 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7,52 +7,56 @@
77
/* cheat main menu button into title bar ********/
88
/************************************************/
99

10-
/* tabs toolbar adjustments */
10+
:root {
11+
--appbutton_in_titlebar: 45px !important;
12+
}
13+
14+
/* menubar adjustments */
1115
#main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar {
12-
padding-inline-start: 43px !important;
16+
padding-inline-start: var(--appbutton_in_titlebar) !important;
1317
}
1418
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar {
15-
padding-inline-start: 41px !important;
19+
padding-inline-start:var(--appbutton_in_titlebar) !important;
1620
}
1721
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar {
18-
padding-inline-start: 40px !important;
22+
padding-inline-start: var(--appbutton_in_titlebar) !important;
1923
}
2024
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar {
21-
padding-inline-start: 39px !important;
25+
padding-inline-start: var(--appbutton_in_titlebar) !important;
2226
}
2327
#main-window[uidensity=touch]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar {
24-
padding-inline-start: 48px !important;
28+
padding-inline-start: var(--appbutton_in_titlebar) !important;
2529
}
2630
#main-window[uidensity=touch]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar {
27-
padding-inline-start: 47px !important;
31+
padding-inline-start: var(--appbutton_in_titlebar) !important;
2832
}
2933

3034
/* tabs toolbar adjustments */
31-
#main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
32-
padding-inline-start: 43px !important;
35+
#main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
36+
padding-inline-start: var(--appbutton_in_titlebar) !important;
3337
}
34-
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
35-
padding-inline-start: 41px !important;
38+
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
39+
padding-inline-start: var(--appbutton_in_titlebar) !important;
3640
}
37-
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
38-
padding-inline-start: 40px !important;
41+
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
42+
padding-inline-start: var(--appbutton_in_titlebar) !important;
3943
}
40-
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
41-
padding-inline-start: 39px !important;
44+
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
45+
padding-inline-start: var(--appbutton_in_titlebar) !important;
4246
}
43-
#main-window[uidensity=touch]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
44-
padding-inline-start: 48px !important;
47+
#main-window[uidensity=touch]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
48+
padding-inline-start: var(--appbutton_in_titlebar) !important;
4549
}
46-
#main-window[uidensity=touch]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
47-
padding-inline-start: 47px !important;
50+
#main-window[uidensity=touch]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
51+
padding-inline-start: var(--appbutton_in_titlebar) !important;
4852
}
4953

5054
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #TabsToolbar {
51-
padding-inline-start: 43px !important;
55+
padding-inline-start: var(--appbutton_in_titlebar) !important;
5256
}
5357

5458
#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]) #toolbar-menubar[autohide="true"]:not([inactive="true"]) ~ #TabsToolbar,
55-
#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]) #toolbar-menubar[autohide="false"] ~ #TabsToolbar{
59+
#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]) #toolbar-menubar[autohide="false"] ~ #TabsToolbar {
5660
margin-top: 4px !important;
5761
}
5862

@@ -75,12 +79,12 @@
7579

7680
@media not (-moz-platform: windows) {
7781
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #PanelUI-button {
78-
top: 0px !important;
82+
top: 0 !important;
7983
}
8084
}
8185

8286
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #PanelUI-button {
83-
top: 0px !important;
87+
top: 0 !important;
8488
}
8589

8690
#main-window:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button {
@@ -101,7 +105,7 @@
101105
/* code for macOS/Linux */
102106
@media not (-moz-platform: windows) {
103107
#main-window:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button {
104-
max-width: 40px !important;
108+
max-width: var(--appbutton_in_titlebar) !important;
105109
}
106110
}
107111

@@ -122,9 +126,9 @@
122126
}
123127

124128
/* adjust button badge stack */
125-
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([checked]):not([open]):not(:active) > .toolbarbutton-badge-stack,
126-
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack,
127-
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack{
129+
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([checked],[open],:active) > .toolbarbutton-badge-stack,
130+
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true],[checked],[open],:active):hover > .toolbarbutton-badge-stack,
131+
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
128132
background: unset !important;
129133
border-color: unset !important;
130134
border: 0 !important;
@@ -150,10 +154,10 @@
150154
border-bottom-color: hsla(214,89%,21%,.5) !important;
151155
box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,
152156
0 0 2px 1px hsla(0,0%,100%,.25) inset,
153-
0 1px 0 0px rgba(255,255,255,.5),
154-
0 -1px 0 0px rgba(255,255,255,.5),
155-
1px 0 0 0px rgba(255,255,255,.5),
156-
-1px 0 0 0px rgba(255,255,255,.5) !important;
157+
0 1px 0 0px rgba(255,255,255,.6),
158+
0 -1px 0 0px rgba(255,255,255,.6),
159+
1px 0 0 0px rgba(255,255,255,.6),
160+
-1px 0 0 0px rgba(255,255,255,.6) !important;
157161
}
158162
#main-window:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){
159163
background-image: radial-gradient(farthest-side at center bottom, rgba(252,240,89,.5) 10%, rgba(252,240,89,0) 70%),
@@ -163,31 +167,31 @@
163167
box-shadow: 0 1px 0 hsla(0,0%,100%,.15) inset,
164168
0 0 2px 1px hsla(0,0%,100%,.5) inset,
165169
0 -1px 0 hsla(0,0%,100%,.2),
166-
0 1px 0 0px rgba(255,255,255,.5),
167-
0 -1px 0 0px rgba(255,255,255,.5),
168-
1px 0 0 0px rgba(255,255,255,.5),
169-
-1px 0 0 0px rgba(255,255,255,.5) !important;
170+
0 1px 0 0px rgba(255,255,255,.6),
171+
0 -1px 0 0px rgba(255,255,255,.6),
172+
1px 0 0 0px rgba(255,255,255,.6),
173+
-1px 0 0 0px rgba(255,255,255,.6) !important;
170174
}
171175
#main-window:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button:is(:hover:active,[open]){
172176
background-image: linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important;
173177
box-shadow: 0 2px 3px rgba(0,0,0,.4) inset,
174178
0 1px 1px rgba(0,0,0,.2) inset,
175-
0 1px 0 0px rgba(255,255,255,.5),
176-
0 -1px 0 0px rgba(255,255,255,.5),
177-
1px 0 0 0px rgba(255,255,255,.5),
178-
-1px 0 0 0px rgba(255,255,255,.5) !important;
179+
0 1px 0 0px rgba(255,255,255,.6),
180+
0 -1px 0 0px rgba(255,255,255,.6),
181+
1px 0 0 0px rgba(255,255,255,.6),
182+
-1px 0 0 0px rgba(255,255,255,.6) !important;
179183
}
180184

181185
/*private browsing - purple */
182-
#main-window[privatebrowsingmode=temporary]:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button{
186+
#main-window[privatebrowsingmode=temporary]:is([tabsintitlebar],[customtitlebar]) #navigator-toolbox #PanelUI-button #PanelUI-menu-button{
183187
background-image: linear-gradient(rgb(153,38,211), rgb(105,19,163) 95%) !important;
184188
}
185-
#main-window[privatebrowsingmode=temporary]:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){
189+
#main-window[privatebrowsingmode=temporary]:is([tabsintitlebar],[customtitlebar]) #navigator-toolbox #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){
186190
background-image: radial-gradient(farthest-side at center bottom, rgba(240,193,255,.5) 10%, rgba(240,193,255,0) 70%),
187191
radial-gradient(farthest-side at center bottom, rgb(192,81,247), rgba(236,172,255,0)),
188192
linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
189193
}
190-
#main-window[privatebrowsingmode=temporary]:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button:is(:hover:active,[open]) {
194+
#main-window[privatebrowsingmode=temporary]:is([tabsintitlebar],[customtitlebar]) #navigator-toolbox #PanelUI-button #PanelUI-menu-button:is(:hover:active,[open]) {
191195
background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
192196
}
193197

@@ -237,7 +241,7 @@
237241

238242
/* support for tab title in Firefox titlebar option*/
239243
#main-window:is([tabsintitlebar],[customtitlebar])::after {
240-
margin-inline-start: 45px !important;
244+
margin-inline-start: var(--appbutton_in_titlebar) !important;
241245
}
242246

243247
/* remove this nonsense button, a menuitem is inside menu button anyways */
@@ -259,6 +263,10 @@
259263
height: unset !important;
260264
}
261265

266+
#TabsToolbar .titlebar-spacer[type="pre-tabs"] {
267+
display: none !important;
268+
}
269+
262270
/* workaround for Firefox 102+ *******************/
263271
panel[id="appMenu-popup"][type="arrow"][side="top"],
264272
panel[id="appMenu-popup"][type="arrow"][side="bottom"] {
@@ -280,7 +288,7 @@ panel[id="appMenu-popup"][type="arrow"][side="bottom"] {
280288
}
281289

282290
#main-window:is([tabsintitlebar],[customtitlebar]) #TabsToolbar {
283-
padding-inline-end: 100px !important;
291+
padding-inline-end: calc(var(--appbutton_in_titlebar) + 5px) !important;
284292
}
285293

286294
#main-window:is([tabsintitlebar],[customtitlebar]) .titlebar-buttonbox-container {

0 commit comments

Comments
 (0)