Skip to content

Commit a1d3f17

Browse files
committed
refactor(css): update media query syntax for dark mode and other preferences
- Changed media query syntax from `-moz-bool-pref` to `-moz-pref` for consistency. - Adjusted background color variables for hover states in various components. - Improved overall readability and maintainability of CSS files.
1 parent 989b445 commit a1d3f17

File tree

6 files changed

+100
-100
lines changed

6 files changed

+100
-100
lines changed

chrome/content/newtab.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ url-prefix("about:home") {
142142
--fp-wordmark-color: light-dark(#737373, #fff);
143143
--fp-background-color-secondary: light-dark(#fff, #4a4a4a);
144144

145-
@media (-moz-bool-pref: "browser.theme.dark-private-windows") {
145+
@media -moz-pref("browser.theme.dark-private-windows") {
146146
color-scheme: dark !important;
147147
}
148148
}

chrome/global/general.css

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515

1616
/* dark mode enabled in private browsing. */
17-
@media (-moz-bool-pref: "browser.theme.dark-private-windows") {
17+
@media -moz-pref("browser.theme.dark-private-windows") {
1818
:root[privatebrowsingmode="temporary"],
1919
:root[privatebrowsingmode="temporary"] #nav-bar,
2020
:root[privatebrowsingmode="temporary"] #PersonalToolbar {
@@ -312,7 +312,7 @@ window#places {
312312
#appMenu-zoomEnlarge-button2:not([disabled], [open], :active):is(:hover),
313313
#appMenu-fullscreen-button2:not([disabled], [open], :active):is(:hover),
314314
#appMenu-zoomReset-button2:not([disabled], [open], :active):is(:hover) {
315-
background-color: var(--panel-item-hover-bgcolor) !important;
315+
background-color: var(--panel-banner-item-hover-bgcolor) !important;
316316
}
317317

318318
#appMenu-zoomReduce-button2:not([disabled]):is([open], :hover:active),
@@ -512,7 +512,7 @@ window#places {
512512
}
513513

514514
#PopupAutoComplete .autocomplete-richlistitem:hover {
515-
background-color: var(--panel-item-hover-bgcolor) !important;
515+
background-color: var(--panel-banner-item-hover-bgcolor) !important;
516516
}
517517

518518
#PopupAutoComplete .autocomplete-richlistitem[selected] {
@@ -671,7 +671,7 @@ menupopup menu:hover:not([disabled=true]),
671671
menupopup menuitem:hover:not([disabled=true]),
672672
menupopup menu[_moz-menuactive]:not([disabled=true]),
673673
menupopup menuitem[_moz-menuactive]:not([disabled=true]) {
674-
background-color: var(--panel-item-hover-bgcolor) !important;
674+
background-color: var(--panel-banner-item-hover-bgcolor) !important;
675675
color: inherit !important;
676676
}
677677

@@ -701,7 +701,6 @@ panel menuseparator,
701701
menupopup menu,
702702
menupopup menuitem,
703703
menupopup menucaption,
704-
705704
#PopupAutoComplete>richlistbox>richlistitem,
706705
#PopupSearchAutoComplete .autocomplete-richlistitem {
707706
padding: var(--fp-contextmenu-menuitem-padding-block) var(--fp-contextmenu-menuitem-padding-inline) !important;
@@ -832,7 +831,7 @@ menuitem[checked="true"]>.menu-iconic-left,
832831
fill: var(--lwt-toolbarbutton-icon-fill-attention, var(--toolbarbutton-icon-fill-attention, currentColor)) !important;
833832
}
834833

835-
@media (-moz-bool-pref: "fp.tweak.sidebar-enabled") {
834+
@media -moz-pref("fp.tweak.sidebar-enabled") {
836835
:not(menupopup:not(#contentAreaContextMenu) > menuitem)[id^="sidebartabs_asamuzak_jp-menuitem-"]>.menu-text {
837836
margin-left: -20px !important;
838837
}
@@ -846,7 +845,7 @@ menuitem[checked="true"]>.menu-iconic-left,
846845
}
847846

848847
#tabbrowser-tabbox {
849-
@media (-moz-bool-pref: "sidebar.revamp") {
848+
@media -moz-pref("sidebar.revamp") {
850849
outline: 0px solid transparent !important;
851850
box-shadow: none !important
852851
}

chrome/icons/icons.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
}
2323

24-
@media (-moz-bool-pref: "fp.tweak.macos-button") {
24+
@media -moz-pref("fp.tweak.macos-button") {
2525
.titlebar-min {
2626
list-style-image: url("mac-minimize.svg") !important;
2727
}

chrome/toolbar/personalbar.css

Lines changed: 90 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,137 +1,138 @@
11
#PersonalToolbar {
2-
--bookmark-block-padding: 6px !important;
3-
position: relative;
4-
}
5-
6-
/* Bookmarks bar item sizing */
2+
--bookmark-block-padding: 6px !important;
3+
position: relative;
4+
}
5+
6+
/* Bookmarks bar item sizing */
77
#personal-toolbar-empty-description,
88
#PersonalToolbar .toolbarbutton-1,
99
toolbarbutton.bookmark-item:not(.subviewbutton) {
10-
margin-block: 2px 4px !important;
11-
padding-block: var(--bookmark-block-padding) !important;
12-
padding-inline: 6px !important;
13-
font-size: 12px !important;
10+
margin-block: 2px 4px !important;
11+
padding-block: var(--bookmark-block-padding) !important;
12+
padding-inline: 6px !important;
13+
font-size: 12px !important;
14+
1415

15-
1616
& .toolbarbutton-text {
17-
margin-block: -1px 0 !important;
17+
margin-block: -1px 0 !important;
1818
}
19-
19+
2020
}
2121

2222
#PersonalToolbar .toolbarbutton-1 {
23-
padding: 0 !important;
23+
padding: 0 !important;
2424
}
2525

2626
/* Bookmarks bar separators */
27-
#PlacesToolbarItems > toolbarseparator {
28-
padding-inline: 1px !important;
29-
&::before {
30-
content: "";
31-
display: block;
32-
border-inline-start: 1px solid var(--toolbarseparator-color) !important;
33-
margin-block: 8px 10px !important;
34-
border-image-source: none !important;
35-
}
27+
#PlacesToolbarItems>toolbarseparator {
28+
padding-inline: 1px !important;
29+
&::before {
30+
content: "";
31+
display: block;
32+
border-inline-start: 1px solid var(--toolbarseparator-color) !important;
33+
margin-block: 8px 10px !important;
34+
border-image-source: none !important;
35+
}
3636
}
3737

3838
/* Left and Right padding of bookmarks bar */
3939
#PersonalToolbar {
40-
padding-inline: calc(var(--toolbar-start-end-padding) - 2px) calc(var(--toolbar-start-end-padding) + 6px) !important;
40+
padding-inline: calc(var(--toolbar-start-end-padding) - 2px) calc(var(--toolbar-start-end-padding) + 6px) !important;
4141
}
4242

4343
/* Spacing between icon and label for bookmarks bar items */
4444
#managed-bookmarks>.toolbarbutton-icon,
4545
#bookmarks-toolbar-placeholder>.toolbarbutton-icon,
4646
#PlacesToolbarItems>.bookmark-item>.toolbarbutton-icon[label]:not([label=""]),
4747
#OtherBookmarks.bookmark-item[container]>.toolbarbutton-icon {
48-
margin-inline-end: 4px !important;
48+
margin-inline-end: 4px !important;
4949
}
5050

5151
/* Sizing for bookmarks bar icons */
5252
#PersonalToolbar .toolbarbutton-1>.toolbarbutton-icon {
53-
width: calc(2 * var(--bookmark-block-padding) + 16px) !important;
54-
height: calc(2 * var(--bookmark-block-padding) + 16px) !important;
55-
padding: var(--bookmark-block-padding) !important;
53+
width: calc(2 * var(--bookmark-block-padding) + 16px) !important;
54+
height: calc(2 * var(--bookmark-block-padding) + 16px) !important;
55+
padding: var(--bookmark-block-padding) !important;
5656
}
5757

5858
toolbarbutton.bookmark-item:not(.subviewbutton, [disabled="true"], [open]):hover {
59-
background-color: rgba(255, 255, 255, 0.1) !important;
59+
background-color: rgba(255, 255, 255, 0.1) !important;
6060
}
6161
toolbarbutton.bookmark-item:hover:active:not(.subviewbutton, [disabled="true"]) {
62-
background-color: rgba(255, 255, 255, 0.2) !important;
62+
background-color: rgba(255, 255, 255, 0.2) !important;
6363
}
6464
toolbarbutton.bookmark-item[open="true"] {
65-
background-color: rgba(255, 255, 255, 0.2) !important;
65+
background-color: rgba(255, 255, 255, 0.2) !important;
6666
}
67-
toolbarbutton.bookmark-item[open="true"] > .toolbarbutton-icon{
68-
filter: brightness(2);
67+
toolbarbutton.bookmark-item[open="true"]>.toolbarbutton-icon {
68+
filter: brightness(2);
6969
}
7070
:root {
71-
--bookmarks-toolbar-overlapping-browser-height: 34px !important;
71+
--bookmarks-toolbar-overlapping-browser-height: 34px !important;
7272
}
7373

7474
/* Autohide bookmark toolbar */
75-
@media (-moz-bool-pref: "fp.tweak.autohide-bookmarks") {
76-
#PersonalToolbar{
77-
--bookmarks-padding: 4px;
78-
--autohide-toolbar-delay: 600ms;
79-
--autohide-toolbar-focus-rotation: 0deg;
80-
--autohide-toolbar-hover-rotation: 0deg;
81-
}
82-
:root {
83-
--firefoxcss-bookmarks-bg-color: transparent !important;
84-
}
85-
:root[uidensity="touch"] #PersonalToolbar{ --bookmarks-padding: 7px }
86-
#PersonalToolbar:not([customizing]){
87-
position: relative;
88-
margin-bottom: -34px;
89-
transform: rotateX(90deg);
90-
transform-origin: top;
91-
transition: transform 135ms linear var(--autohide-toolbar-delay) !important;
92-
z-index: 1;
93-
height: 34px;
94-
}
95-
/* .browser-toolbar:not(.titlebar-color):not(.browser-toolba) {
75+
@media -moz-pref("fp.tweak.autohide-bookmarks") {
76+
#PersonalToolbar {
77+
--bookmarks-padding: 4px;
78+
--autohide-toolbar-delay: 600ms;
79+
--autohide-toolbar-focus-rotation: 0deg;
80+
--autohide-toolbar-hover-rotation: 0deg;
81+
}
82+
:root {
83+
--firefoxcss-bookmarks-bg-color: transparent !important;
84+
}
85+
:root[uidensity="touch"] #PersonalToolbar {
86+
--bookmarks-padding: 7px
87+
}
88+
#PersonalToolbar:not([customizing]) {
89+
position: relative;
90+
margin-bottom: -34px;
91+
transform: rotateX(90deg);
92+
transform-origin: top;
93+
transition: transform 135ms linear var(--autohide-toolbar-delay) !important;
94+
z-index: 1;
95+
height: 34px;
96+
}
97+
/* .browser-toolbar:not(.titlebar-color):not(.browser-toolba) {
9698
background-color: var(--toolbar-bgcolor) !important;
9799
} */
98-
:root[uidensity="compact"] #PersonalToolbar{
99-
--toolbarbutton-outer-padding: 1px !important;
100-
}
101-
#PersonalToolbar:not(:-moz-lwtheme){
102-
--toolbar-bgcolor: #f9f9fb;
103-
}
104-
@media (prefers-color-scheme: dark){
105-
#PersonalToolbar:not(:-moz-lwtheme){
106-
--toolbar-bgcolor: rgb(43, 42, 51);
107-
}
108-
}
109-
#PlacesToolbarItems > .bookmark-item,
110-
#OtherBookmarks,
111-
#PersonalToolbar > #import-button{
112-
padding-block: var(--bookmarks-padding) !important;
113-
}
100+
:root[uidensity="compact"] #PersonalToolbar {
101+
--toolbarbutton-outer-padding: 1px !important;
102+
}
103+
#PersonalToolbar:not(:-moz-lwtheme) {
104+
--toolbar-bgcolor: #f9f9fb;
105+
}
106+
@media (prefers-color-scheme: dark) {
107+
#PersonalToolbar:not(:-moz-lwtheme) {
108+
--toolbar-bgcolor: rgb(43, 42, 51);
109+
}
110+
}
111+
#PlacesToolbarItems>.bookmark-item,
112+
#OtherBookmarks,
113+
#PersonalToolbar>#import-button {
114+
padding-block: var(--bookmarks-padding) !important;
115+
}
114116

115-
#nav-bar:focus-within + #PersonalToolbar{
116-
transition-delay: 100ms !important;
117-
transform: rotateX(var(--autohide-toolbar-focus-rotation,0));
118-
}
119-
#navigator-toolbox:is(:hover,:focus-within){
120-
border-bottom: 0;
121-
}
122-
#navigator-toolbox:hover > #PersonalToolbar
123-
{
124-
transition-delay: 800ms !important;
125-
transform: rotateX(var(--autohide-toolbar-hover-rotation,0)) !important;
126-
}
117+
#nav-bar:focus-within+#PersonalToolbar {
118+
transition-delay: 100ms !important;
119+
transform: rotateX(var(--autohide-toolbar-focus-rotation, 0));
120+
}
121+
#navigator-toolbox:is(:hover, :focus-within) {
122+
border-bottom: 0;
123+
}
124+
#navigator-toolbox:hover>#PersonalToolbar {
125+
transition-delay: 800ms !important;
126+
transform: rotateX(var(--autohide-toolbar-hover-rotation, 0)) !important;
127+
}
127128

128-
#navigator-toolbox:hover > #nav-bar:focus-within + #PersonalToolbar,
129-
#navigator-toolbox:hover > #nav-bar:focus-within + #TabsToolbar{
130-
transform: rotateX(0) !important;
131-
}
129+
#navigator-toolbox:hover>#nav-bar:focus-within+#PersonalToolbar,
130+
#navigator-toolbox:hover>#nav-bar:focus-within+#TabsToolbar {
131+
transform: rotateX(0) !important;
132+
}
132133

133134
}
134135
#navigator-toolbox {
135-
z-index: 3 !important;
136-
border-bottom: 0 !important
137-
}
136+
z-index: 3 !important;
137+
border-bottom: 0 !important
138+
}

chrome/toolbar/tabbar.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
}
322322

323323
.tab-group-label-container {
324-
@media not (-moz-bool-pref: "sidebar.verticalTabs") {
324+
@media not -moz-pref("sidebar.verticalTabs") {
325325
tab-group:not([collapsed]) > &::after {
326326
display: none !important;
327327
}

chrome/userChrome.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
@import url("toolbar/searchbar.css");
66
@import url("global/general.css");
77
@import url("icons/icons.css");
8-
@import url("global/rounded-corners.css") (-moz-bool-pref: "fp.tweak.rounded-corners");
8+
@import url("global/rounded-corners.css") -moz-pref("fp.tweak.rounded-corners");

0 commit comments

Comments
 (0)