Skip to content

Commit e6fa425

Browse files
Aris-t2Aris-t2
committed
4.6.7
1 parent cbf2735 commit e6fa425

8 files changed

Lines changed: 165 additions & 170 deletions

‎current/css/generalui/private_mode_indicator_hidden.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
visibility: collapse !important;
1212
}
1313

14-
#TabsToolbar :is(#private-browsing-indicator-with-label,.private-browsing-indicator-with-label) {
14+
#TabsToolbar :is(#private-browsing-indicator-with-label,.private-browsing-indicator-with-label, .private-browsing-indicator-icon,.private-browsing-indicator-label) {
1515
display: none !important;
1616
}

‎current/css/locationbar/urlbar_background_old_colors.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
/* restore correct location bar colors, known from pre-Fx133 versions */
77

8-
:root {
8+
:root:not([lwtheme]) {
99
--toolbar-field-background-color: Field !important;
1010
--toolbar-field-color: FieldText !important;
1111
--toolbar-field-border-color: var(--input-border-color) !important;

‎current/css/locationbar/urlbar_background_old_colors_lwtheme.css‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/* Firefox userChrome.css tweaks ********************************************************/
2+
/* Github: https://github.com/aris-t2/customcssforfx ************************************/
3+
/****************************************************************************************/
4+
5+
6+
/* restore correct location bar colors, known from pre-Fx133 versions */
7+
8+
:root[lwtheme] {
9+
--toolbar-field-background-color: Field !important;
10+
--toolbar-field-color: FieldText !important;
11+
--toolbar-field-border-color: var(--input-border-color) !important;
12+
--toolbar-field-focus-background-color: Field !important;
13+
--toolbar-field-focus-color: FieldText !important;
14+
--toolbar-field-focus-border-color: color-mix(in srgb, var(--focus-outline-color) 50%, transparent) !important;
15+
}

‎current/css/tabs/tabs_below_main_content.css‎

Lines changed: 34 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/****************************************************************************************/
44

55

6-
@import "./tabs_below_navigation_toolbar_fx128-132.css";
6+
@import "./tabs_below_navigation_toolbar.css";
77

88
/* [!] NOT A STANDALONE FILE! */
99
/* [!] This code does not achieve the requested result without above files content! */
@@ -15,34 +15,48 @@
1515
--tab_below_main_content_top_margin: -3px;
1616
}
1717

18-
#main-window:not([chromehidden*="toolbar"]) #navigator-toolbox {
19-
padding-bottom: 1px !important;
20-
}
2118

2219
#main-window:not([inDOMFullscreen="true"]) #TabsToolbar {
23-
position: fixed !important;
24-
display: block !important;
20+
position: fixed;
21+
display: block;
22+
bottom: 0;
23+
width: 100vw;
24+
background-clip: padding-box;
25+
color: var(--toolbar-color);
26+
min-height: 0 !important;
27+
height: var(--tab_below_main_content_toolbar_height) !important;
28+
max-height: unset !important;
29+
border-top: 1px solid ThreeDShadow !important;
2530
}
2631

27-
#main-window:not([chromehidden*="toolbar"]) #navigator-toolbox {
28-
padding-bottom: 0px !important;
29-
border-bottom: 1px solid threedshadow !important;
32+
#tabbrowser-tabs {
33+
width: 100%;
3034
}
31-
/*
35+
3236
#main-window:not([inDOMFullscreen="true"]) #browser,
3337
#main-window:not([inDOMFullscreen="true"]) #customization-container {
3438
margin-bottom: var(--tab_below_main_content_bottom_margin) !important;
35-
}*/
39+
}
3640

37-
#TabsToolbar {
38-
min-height: 0 !important;
39-
height: var(--tab_below_main_content_toolbar_height) !important;
40-
max-height: unset !important;
41-
border-top: 1px solid ThreeDShadow !important;
41+
#navigator-toolbox {
42+
z-index: 3 !important;
43+
}
44+
45+
#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]):not([inDOMFullscreen="true"]) #toolbar-menubar[inactive] ~ #nav-bar {
46+
padding-top: 24px !important;
47+
}
48+
49+
#toolbar-menubar,
50+
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #nav-bar {
51+
padding-inline-end: 140px !important;
52+
}
53+
54+
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #toolbar-menubar[inactive] ~ #nav-bar {
55+
padding-top: initial !important;
4256
}
4357

44-
#main-window:not([inDOMFullscreen="true"]) #TabsToolbar-customization-target {
45-
margin-top: var(--tab_below_main_content_top_margin) !important;
58+
#toolbar-menubar:not([inactive]) {
59+
height: 24px !important;
4660
}
4761

4862
/* lw-theme support */
@@ -56,51 +70,19 @@
5670
/* caption button position in maximized mode after moving to the top */
5771
#main-window:is([tabsintitlebar],[customtitlebar]):not([inDOMFullscreen="true"]) #toolbar-menubar ~ #TabsToolbar .titlebar-buttonbox-container,
5872
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #TabsToolbar .titlebar-buttonbox-container {
59-
top: 0px !important;
73+
top: 0 !important;
6074
}
6175

62-
76+
/* macOS support*/
6377
@media (-moz-platform: macos) {
6478

6579
#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]):not([inDOMFullscreen="true"]) #navigator-toolbox {
6680
padding-top: 24px !important;
6781
}
6882

69-
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"]:not([inDOMFullscreen="true"]) #titlebar {
70-
height: 0 !important;
71-
padding-top: 0 !important;
72-
z-index: 1 !important;
73-
}
74-
7583
#main-window[sizemode="fullscreen"]:not([inDOMFullscreen="true"]) #browser,
7684
#main-window[sizemode="fullscreen"]:not([inDOMFullscreen="true"]) #customization-container {
7785
margin-bottom: 0 !important;
7886
}
7987

8088
}
81-
82-
#navigator-toolbox {
83-
z-index: 3 !important;
84-
}
85-
86-
/* Fx 133+ adjustments */
87-
#toolbar-menubar[inactive] ~ #nav-bar {
88-
padding-top: 28px !important;
89-
}
90-
91-
#toolbar-menubar {
92-
padding-inline-end: 140px;
93-
}
94-
95-
#toolbar-menubar:not([inactive]) {
96-
height: 28px !important;
97-
}
98-
99-
100-
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #nav-bar {
101-
padding-inline-end: 140px !important;
102-
}
103-
104-
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #toolbar-menubar[inactive] ~ #nav-bar {
105-
padding-top: initial !important;
106-
}

‎current/css/tabs/tabs_below_navigation_toolbar.css‎

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,21 @@
1717
}
1818

1919
#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]) #toolbar-menubar[inactive] ~ #nav-bar {
20-
padding-top: 28px !important;
20+
padding-top: 24px !important;
2121
}
2222

2323
#main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar {
2424
padding-inline-end: 140px;
2525
}
2626

2727
#main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar:not([inactive]) {
28-
height: 28px !important;
28+
height: 24px !important;
29+
}
30+
31+
#toolbar-menubar[autohide="true"] {
32+
:root:is([tabsintitlebar],[customtitlebar]) #navigator-toolbox:not([tabs-hidden]) > & {
33+
min-height: unset !important;
34+
}
2935
}
3036

3137
/* move caption buttons to windows top right position */
@@ -47,39 +53,39 @@
4753

4854
@media (-moz-platform: macos) {
4955

50-
#navigator-toolbox {
51-
position: relative;
52-
padding-bottom: var(--tab_below_navigation_toolbar_bottom_padding_macOS);
53-
}
56+
#navigator-toolbox {
57+
position: relative;
58+
padding-bottom: var(--tab_below_navigation_toolbar_bottom_padding_macOS);
59+
}
5460

55-
#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]):not([inDOMFullscreen="true"]) #navigator-toolbox {
56-
padding-top: var(--tab_below_navigation_toolbar_toolbox_top_padding_macOS);
57-
}
61+
#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]):not([inDOMFullscreen="true"]) #navigator-toolbox {
62+
padding-top: var(--tab_below_navigation_toolbar_toolbox_top_padding_macOS);
63+
}
5864

59-
#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]):not([inDOMFullscreen="true"]) .titlebar-buttonbox-container {
60-
position: fixed;
61-
top: 3px !important;
62-
right: unset;
63-
left: 0;
64-
visibility: visible;
65-
display: block;
66-
}
65+
#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]):not([inDOMFullscreen="true"]) .titlebar-buttonbox-container {
66+
position: fixed;
67+
top: 3px !important;
68+
right: unset;
69+
left: 0;
70+
visibility: visible;
71+
display: block;
72+
}
6773

68-
:root[lwtheme] #titlebar {
69-
background-image: var(--lwt-header-image, var(--lwt-additional-images));
70-
background-repeat: var(--lwt-background-tiling);
71-
background-position: var(--lwt-background-alignment);
72-
}
74+
:root[lwtheme] #titlebar {
75+
background-image: var(--lwt-header-image, var(--lwt-additional-images));
76+
background-repeat: var(--lwt-background-tiling);
77+
background-position: var(--lwt-background-alignment);
78+
}
7379

74-
/* caption button position in maximized mode after moving to the top */
75-
#main-window:is([tabsintitlebar],[customtitlebar]):not([inDOMFullscreen="true"]) #toolbar-menubar[autohide="true"] ~ #TabsToolbar .titlebar-buttonbox-container,
76-
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #TabsToolbar .titlebar-buttonbox-container {
77-
top: 0;
78-
}
80+
/* caption button position in maximized mode after moving to the top */
81+
#main-window:is([tabsintitlebar],[customtitlebar]):not([inDOMFullscreen="true"]) #toolbar-menubar[autohide="true"] ~ #TabsToolbar .titlebar-buttonbox-container,
82+
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #TabsToolbar .titlebar-buttonbox-container {
83+
top: 0;
84+
}
7985

80-
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #titlebar {
81-
height: 0px;
82-
}
86+
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #titlebar {
87+
height: 0px;
88+
}
8389
}
8490

8591
/* remove unneeded items */
@@ -88,7 +94,11 @@
8894
#TabsToolbar #window-controls,
8995
#TabsToolbar *[type="caption-buttons"],
9096
#TabsToolbar *[type="pre-tabs"],
91-
#TabsToolbar *[type="post-tabs"] {
97+
#TabsToolbar *[type="post-tabs"],
98+
#private-browsing-indicator-with-label,
99+
.private-browsing-indicator-with-label,
100+
.private-browsing-indicator-icon,
101+
.private-browsing-indicator-label {
92102
display: none;
93103
}
94104

0 commit comments

Comments
 (0)