Skip to content

Commit ababd99

Browse files
LockframeLockframe
committed
143 fixes
* Implemented a temporary online fix to the context menu navigation button icons * Adjusted 'bookmark page' context menu entry icon size * Fixed new tab button overlapping with pinned tabs * Fixed urlbar-background styles not being applied * Fixed app panel separator using incorrect styling * Updated the syntax for the [hidden] attribute * Hide-with-1-tab tweak now uses native implementation of titlebar buttons in the navbar * Restored the proper background color to the internal browser pages, which had been changed to white/purple as of FF 143 - Removed about:config wet floor sign
1 parent 3af155a commit ababd99

File tree

2 files changed

+82
-69
lines changed

2 files changed

+82
-69
lines changed

‎chrome/userChrome.css‎

Lines changed: 76 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -265,22 +265,20 @@ h1, h2, h3 {
265265
}
266266
#pageAction-panel-bookmark:not([starred]),
267267
#context-bookmarkpage:not([starred]) {
268-
list-style-image: url('icons/star.svg') !important;
269-
list-style-image: none !important;
270268
background-image: url(icons/star.svg);
271269
background-repeat: no-repeat;
272-
background-size: 16px;
270+
background-size: 17px;
273271
background-position: 10px 6px !important;
274272
-moz-context-properties: fill !important;
275273
fill: var(--textPrimary) !important;
276274
}
275+
277276
#pageAction-panel-bookmark[starred],
278277
#context-bookmarkpage[starred] {
279-
list-style-image: url("icons/star-filled.svg") !important;
280278
list-style-image: none !important;
281279
background-image: url(icons/star-filled.svg) !important;
282280
background-repeat: no-repeat;
283-
background-size: 16px;
281+
background-size: 17px;
284282
background-position: 10px 5px !important;
285283
-moz-context-properties: fill !important;
286284
fill: var(--textPrimary) !important;
@@ -996,6 +994,28 @@ menuitem[command="placesCmd_sortBy:name"] .menu-text::after {
996994
}
997995
}
998996

997+
#appMenu-empty-profiles-button .toolbarbutton-icon {
998+
list-style-image: url(icons/contact.svg);
999+
height: 16px;
1000+
}
1001+
1002+
/* Use web links until the local path method is found */
1003+
#context-back {
1004+
--menuitem-icon: url(https://raw.githubusercontent.com/Lockframe/Firefox-WinUI/refs/heads/main/chrome/icons/back.svg) !important;
1005+
}
1006+
#context-forward {
1007+
--menuitem-icon: url(https://raw.githubusercontent.com/Lockframe/Firefox-WinUI/refs/heads/main/chrome/icons/forward.svg) !important;
1008+
}
1009+
#context-reload {
1010+
--menuitem-icon: url(https://raw.githubusercontent.com/Lockframe/Firefox-WinUI/refs/heads/main/chrome/icons/reload.svg) !important;
1011+
}
1012+
#context-bookmarkpage {
1013+
--menuitem-icon: unset !important;
1014+
}
1015+
1016+
1017+
/* =========================================== */
1018+
9991019
/* Active tab with semibold text */
10001020
.tabbrowser-tab[selected] label {
10011021
font-weight: 600 !important;
@@ -1726,6 +1746,12 @@ input[type="text"] {
17261746
#pinned-tabs-container[orient="horizontal"] {
17271747
margin-inline: 0 -7px !important;
17281748
}
1749+
/* Prevent add-tab button from overlapping with the pinned tab */
1750+
:root:has(#pinned-tabs-container[orient="horizontal"], .tabbrowser-tab[pinned="true"]):not(:has(.tabbrowser-tab:not([pinned="true"]))) {
1751+
.tabbrowser-tab:last-of-type {
1752+
margin-right: 8px !important;
1753+
}
1754+
}
17291755

17301756
/* Prevent separator from appearing if the first tab is selected/hovered */
17311757
#tabbrowser-tabs:has(.tabbrowser-tab[selected="true"][visuallyselected=""]:not([pinned="true"]):first-of-type),
@@ -1745,7 +1771,7 @@ input[type="text"] {
17451771
}
17461772

17471773
/* Remove unnecessary outline */
1748-
#urlbar-background, #searchbar {
1774+
.urlbar-background, #searchbar {
17491775
#urlbar[open] & {
17501776
:root:not([lwtheme]) & {
17511777
outline-color: transparent !important;
@@ -1962,7 +1988,7 @@ tooltip,
19621988
}
19631989

19641990
/* URL bar customization */
1965-
#urlbar-background {
1991+
.urlbar-background {
19661992
outline: none !important;
19671993
border: none !important;
19681994
height: 30px !important;
@@ -1975,7 +2001,7 @@ tooltip,
19752001
}
19762002

19772003
/* Open URL bar & results */
1978-
#urlbar[open]>#urlbar-background,
2004+
#urlbar[open]>.urlbar-background,
19792005
#urlbar[breakout][breakout-extend][open] {
19802006
border-radius: 3px 3px 8px 8px !important;
19812007
}
@@ -2116,7 +2142,7 @@ moz-input-box > menupopup .context-menu-add-engine > .menu-iconic-left::after {
21162142
height: 30px !important;
21172143
transform: translateY(8px) !important;
21182144

2119-
& #urlbar-background {
2145+
& .urlbar-background {
21202146
border-radius: 3px 3px 0 0 !important;
21212147
border-bottom: 1px transparent !important;
21222148
}
@@ -2128,7 +2154,7 @@ moz-input-box > menupopup .context-menu-add-engine > .menu-iconic-left::after {
21282154
}
21292155
}
21302156

2131-
#urlbar, #urlbar-background, .urlbar-input-container {
2157+
#urlbar, .urlbar-background, .urlbar-input-container {
21322158
animation: none !important;
21332159
}
21342160

@@ -2201,6 +2227,18 @@ menuitem {
22012227
}
22022228
}
22032229

2230+
/* Replace colorful panel border color with the proper separator styling */
2231+
.PanelUI-subView {
2232+
& toolbarseparator.proton-zap::before {
2233+
border-image: none !important;
2234+
}
2235+
}
2236+
2237+
.panel-viewcontainer toolbarseparator {
2238+
margin-inline: -14px !important;
2239+
color: var(--dropdownSeparator) !important;
2240+
}
2241+
22042242
#PanelUI-fxa h1 span::before {
22052243
margin-right: 18px !important;
22062244
translate: 0 -2px !important;
@@ -3607,7 +3645,7 @@ button:has(img[src="chrome://global/skin/icons/settings.svg"]) {
36073645
}
36083646

36093647
/* Rounded upper left corner if the side panel is shown */
3610-
:root:has(#sidebar-main:not([hidden="true"])) {
3648+
:root:has(#sidebar-main:not([hidden=""])) {
36113649
browser[contextmenu="contentAreaContextMenu"]:not(.webextension-popup-browser, .sidebar) {
36123650
margin: -1px !important;
36133651
border-radius: 8px 0 0 0 !important;
@@ -4019,7 +4057,7 @@ findbar {
40194057
order: -1 !important;
40204058
z-index: 99 !important;
40214059

4022-
&:has(.found-matches:not([hidden="true"])) {
4060+
&:has(.found-matches:not([hidden=""])) {
40234061
width: 58rem !important;
40244062
}
40254063
}
@@ -4131,7 +4169,7 @@ findbar:not([hidden]) {
41314169

41324170
/* Matches found */
41334171
.findbar-find-status, .found-matches {
4134-
&:not([hidden="true"]) {
4172+
&:not([hidden=""]) {
41354173
display: block !important;
41364174
margin-inline: 2px 0 !important;
41374175
font-size: 13px !important;
@@ -5212,11 +5250,11 @@ html[windowtype="Toolkit:PictureInPicture"] {
52125250
}
52135251

52145252
/* Accurate implementation of the bottom accent border when url bar is focused */
5215-
#urlbar[breakout][breakout-extend]:not([usertyping]) > #urlbar-background,
5216-
#urlbar[breakout][breakout-extend]:not([usertyping]):focus-within >#urlbar-background {
5253+
#urlbar[breakout][breakout-extend]:not([usertyping]) > .urlbar-background,
5254+
#urlbar[breakout][breakout-extend]:not([usertyping]):focus-within >.urlbar-background {
52175255
border-radius: 3px !important;
52185256
}
5219-
#urlbar[breakout][breakout-extend]:not([usertyping]):focus-within >#urlbar-background::after {
5257+
#urlbar[breakout][breakout-extend]:not([usertyping]):focus-within >.urlbar-background::after {
52205258
content: '';
52215259
width: 100%;
52225260
height: 2px;
@@ -5562,13 +5600,6 @@ img[src="chrome://global/skin/icons/highlights.svg"] {
55625600
}
55635601
}
55645602

5565-
5566-
5567-
#appMenu-empty-profiles-button .toolbarbutton-icon {
5568-
list-style-image: url(icons/contact.svg);
5569-
height: 16px;
5570-
}
5571-
55725603
#appMenu-fxa-label2[fxastatus="not_configured"] {
55735604
padding-left: 0 !important;
55745605

@@ -5877,16 +5908,16 @@ toolbarbutton[itemtype="showinactivebutton"] label {
58775908
}
58785909

58795910
/* URL bar customization */
5880-
#urlbar-background, #searchbar {
5911+
.urlbar-background, #searchbar {
58815912
background-color: var(--searchBackground) !important;
58825913
}
58835914
/* Hover */
5884-
#urlbar:hover>#urlbar-background, #searchbar:hover {
5915+
#urlbar:hover>.urlbar-background, #searchbar:hover {
58855916
background-color: var(--searchHover) !important;
58865917
}
58875918

58885919
/* Open */
5889-
#urlbar[open]>#urlbar-background {
5920+
#urlbar[open]>.urlbar-background {
58905921
background-color: var(--inputActive) !important;
58915922
}
58925923
/* Results */
@@ -6165,12 +6196,12 @@ button
61656196
}
61666197

61676198
/* URL bar and search bar customization */
6168-
#urlbar-background, #searchbar {
6199+
.urlbar-background, #searchbar {
61696200
box-shadow: var(--buttonShadowDark) !important;
61706201
}
61716202

61726203
/* Open */
6173-
#urlbar[open]>#urlbar-background {
6204+
#urlbar[open]>.urlbar-background {
61746205
box-shadow: var(--buttonShadowDarkPressed) !important;
61756206
}
61766207
#searchbar:focus-within {
@@ -6335,11 +6366,11 @@ button
63356366
}
63366367

63376368
/* URL bar customization */
6338-
#urlbar-background, #searchbar {
6369+
.urlbar-background, #searchbar {
63396370
box-shadow: var(--buttonShadowLight) !important;
63406371
}
63416372
/* Open */
6342-
#urlbar[open]>#urlbar-background {
6373+
#urlbar[open]>.urlbar-background {
63436374
box-shadow: var(--buttonShadowLightPressed) !important;
63446375
}
63456376
#searchbar:focus-within {
@@ -6672,36 +6703,16 @@ button
66726703
display: none !important;
66736704
}
66746705

6675-
/* Push immovable panel button to make space for window controls */
6676-
#PanelUI-button {
6677-
margin-right: 140px !important;
6678-
}
6679-
6680-
/* Push titlebar buttons into the navbar */
6681-
#tabbrowser-arrowscrollbox-periphery * {
6682-
z-index: 99 !important;
6683-
}
6684-
.titlebar-buttonbox-container {
6685-
z-index: 1 !important;
6686-
margin-bottom: -48px !important;
6687-
pointer-events: all !important;
6688-
6689-
}
6690-
/* Make titlebar buttons clickable */
6691-
#nav-bar {
6692-
z-index: -1 !important;
6693-
}
6694-
66956706
/* Spacer for window dragging */
66966707
.titlebar-spacer[type="post-tabs"],
66976708
:root[privatebrowsingmode="temporary"]:not([chromehidden~="toolbar"]) #nav-bar .titlebar-spacer[type="post-tabs"] {
66986709
display: block !important;
66996710
}
6700-
}
67016711

6702-
/* Match regular titlebar button box width */
6703-
#TabsToolbar > .titlebar-buttonbox-container{
6704-
contain-intrinsic-width: 140px;
6712+
/* Use native implementation of navbar titlebar buttons */
6713+
#nav-bar .titlebar-buttonbox-container {
6714+
display: flex !important;
6715+
}
67056716
}
67066717
}
67076718
}
@@ -6780,11 +6791,11 @@ button
67806791
}
67816792

67826793
@media -moz-pref("uc.winui.pill-urlbar") {
6783-
#urlbar-background {
6794+
.urlbar-background {
67846795
border-radius: 99px !important;
67856796
}
67866797
#urlbar[breakout][breakout-extend][open],
6787-
#urlbar[breakout][breakout-extend][open] > #urlbar-background {
6798+
#urlbar[breakout][breakout-extend][open] > .urlbar-background {
67886799
border-radius: 16px 16px 0 0 !important;
67896800
}
67906801
#identity-icon-box {
@@ -6795,11 +6806,11 @@ button
67956806
}
67966807

67976808
/* Accent bottom border */
6798-
#urlbar[breakout][breakout-extend]:not([usertyping]) > #urlbar-background,
6799-
#urlbar[breakout][breakout-extend]:not([usertyping]):focus-within >#urlbar-background {
6809+
#urlbar[breakout][breakout-extend]:not([usertyping]) > .urlbar-background,
6810+
#urlbar[breakout][breakout-extend]:not([usertyping]):focus-within >.urlbar-background {
68006811
border-radius: 16px !important;
68016812
}
6802-
#urlbar[breakout][breakout-extend]:not([usertyping]):focus-within >#urlbar-background::after {
6813+
#urlbar[breakout][breakout-extend]:not([usertyping]):focus-within >.urlbar-background::after {
68036814
height: 30px !important;
68046815
margin-top: 1px !important;
68056816
clip-path: inset(28px 0 0 0) !important;
@@ -6836,7 +6847,7 @@ button
68366847
}
68376848

68386849
@media -moz-pref("uc.winui.transparent-urlbar") {
6839-
#urlbar-background {
6850+
.urlbar-background {
68406851
background-color: transparent !important;
68416852
box-shadow: none !important;
68426853
}
@@ -7213,12 +7224,12 @@ button
72137224
}
72147225

72157226
@media -moz-pref("uc.winui.taller-urlbar") {
7216-
#urlbar-background {
7227+
.urlbar-background {
72177228
height: 34px !important;
72187229
margin-top: -2px !important;
72197230
}
72207231
/* Accent bottom border */
7221-
#urlbar[breakout][breakout-extend]:not([usertyping]):focus-within >#urlbar-background::after {
7232+
#urlbar[breakout][breakout-extend]:not([usertyping]):focus-within >.urlbar-background::after {
72227233
height: 34px !important;
72237234
margin-top: 1px !important;
72247235
clip-path: inset(32px 0 0 0) !important;
@@ -7494,18 +7505,18 @@ button
74947505
menupopup menuitem[_moz-menuactive]:not([disabled=true]),
74957506
menupopup menu:not([disabled=true]),
74967507
menupopup menuitem:not([disabled=true]),
7497-
#urlbar-background,
7508+
.urlbar-background,
74987509
#searchbar,
74997510
.download-state {
75007511
transition: var(--basicBGAnimation) !important;
75017512
}
75027513

7503-
#urlbar[breakout][breakout-extend]:not([usertyping]):focus-within >#urlbar-background::after {
7514+
#urlbar[breakout][breakout-extend]:not([usertyping]):focus-within >.urlbar-background::after {
75047515
animation: selectorBar2 187ms forwards;
75057516
}
75067517

75077518
#urlbar[breakout][breakout-extend][open],
7508-
#urlbar[open]>#urlbar-background {
7519+
#urlbar[open]>.urlbar-background {
75097520
transition: none !important;
75107521
}
75117522

@@ -8830,10 +8841,6 @@ button
88308841
box-shadow: none !important;
88318842
}
88328843
}
8833-
8834-
#updateIcon {
8835-
display: none !important;
8836-
}
88378844

88388845
@media not -moz-pref("widget.windows.mica") {
88398846
#aboutDialogContainer, window#aboutDialog {

‎chrome/userContent.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,8 @@
663663

664664
--prefs-table-border-width: 0 !important;
665665
--main-margin-start: unset !important;
666+
667+
background-color: light-dark(rgba(255,255,255,.45),rgba(58,58,58,.25)) !important;
666668

667669
scrollbar-color:
668670
light-dark(rgb(37 37 37 / .4), rgb(255 255 255 / .4))
@@ -860,6 +862,10 @@
860862
fill: var(--textPressed) !important;
861863
}
862864
}
865+
866+
.config-background {
867+
display: none !important;
868+
}
863869

864870
/* Parts restyling */
865871
* {

0 commit comments

Comments
 (0)