Skip to content

Commit 89c0aec

Browse files
GodiescGodiesc
authored
Various bug fixes for Firefox v.145
1 parent 3b73466 commit 89c0aec

File tree

8 files changed

+123
-98
lines changed

8 files changed

+123
-98
lines changed

‎chrome/components/ogx_UC-newtabpage.css‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,11 +367,17 @@
367367
.personalize-button {
368368
img {content: url("../icons/edit.svg") !important; }
369369

370-
&:hover {
370+
&:hover,
371+
&:focus {
371372
background-color: var(--newtab-element-secondary-hover-color) !important;
372373
backdrop-filter: var(--personal-blur) !important;
373374
}
374375
}
376+
377+
/* Keep personalize button collapse after close customize menu (slider) */
378+
.personalize-button.personalize-animate-enter.personalize-animate-enter-active {
379+
display: none !important;
380+
}
375381

376382
/* Colors of the 'Close' button */
377383

‎chrome/components/ogx_UC-settings-addons-pages.css‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
https://github.com/Godiesc/firefox-gx */
33

44
window, dialog, .dialogBox {
5-
--background-color-canvas: var(--background-color-canvas) !important; /* Background-color */
5+
--background-color-canvas: var(--in-content-page-background) !important; /* Background-color */
66

77
--button-background-color-primary: var(--button-active-bgcolor) !important; /* Background-primary color */
88
--button-text-color-primary: var(--in-content-primary-button-text-color); /* Label primary button */
@@ -16,7 +16,7 @@ window, dialog, .dialogBox {
1616
window, dialog, .dialogBox {
1717

1818
--color-accent-primary: var(--general-color) !important;
19-
--background-color-canvas: #1a1a24 !important;
19+
--in-content-page-background: #1a1a24 !important;
2020
--in-content-primary-button-background: var(--general-color) !important;
2121
--in-content-primary-button-text-color: white !important;
2222
--in-content-primary-button-background-hover: var(--button-active-bgcolor) !important; /* Radiobutton background color on 'hover' */
@@ -29,7 +29,7 @@ window, dialog, .dialogBox {
2929
@media (prefers-color-scheme: light) {
3030
window, dialog, .dialogBox {
3131
--color-accent-primary: var(--general-color) !important;
32-
--background-color-canvas: #f9f9f9 !important;
32+
--in-content-page-background: #f9f9f9 !important;
3333
--in-content-primary-button-background: var(--general-color) !important;
3434
--in-content-primary-button-text-color: white !important;
3535
--in-content-primary-button-background-hover: var(--button-active-bgcolor) !important; /* Radiobutton background color on 'hover' */
@@ -53,8 +53,7 @@ window, dialog, .dialogBox {
5353

5454
--in-content-box-background-odd: color-mix(in srgb,
5555
var(--in-content-box-border-color), transparent) !important;
56-
--table-row-background-color-alternate: color-mix(in srgb,
57-
var(--background-color-canvas) 95%, var(--in-content-text-color)) !important; /* Color distinction between rows in a 'table' and 'search shortcuts' */
56+
--table-row-background-color-alternate: var(--in-content-page-background) !important; /* Color distinction between rows in a 'table' and 'search shortcuts' */
5857

5958
--in-content-box-info-background: var(--in-content-box-background-odd) !important; /* Background color of the box of items that sync */
6059
--section-highlight-background-color: var(--in-content-box-info-background) !important;
@@ -63,7 +62,7 @@ window, dialog, .dialogBox {
6362
--in-content-table-border-color: var(--in-content-box-border-color) !important; /* table border color */
6463

6564
--background-color-box: var(--in-content-box-background) !important; /* Background color of tables */
66-
--in-content-table-background: var(--background-color-canvas) !important; /* Background color of 'about:support' tables */
65+
--in-content-table-background: var(--in-content-page-background) !important; /* Background color of 'about:support' tables */
6766

6867
--card-outline-color: var(--general-color) !important; /* outline color in 'themes' and 'extensions' */
6968
--card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color) !important; /* outline color in 'themes' and 'extensions' on 'hover' */
@@ -79,9 +78,9 @@ window, dialog, .dialogBox {
7978

8079
--button-border-color-hover: var(--button-bgcolor) !important; /* Button border color on 'hover' */
8180

82-
--button-background-color-primary: var(--button-hover-bgcolor) !important; /* Primary button background */
83-
--button-background-color-primary-hover: var(--button-active-bgcolor) !important; /* Primary button background on 'hover' */
84-
--button-background-color-primary-active: var(--button-hover-bgcolor) !important; /* Primary button background on 'active' */
81+
--button-background-color-primary: var(--button-hover-bgcolor) !important; /* Primary button background */
82+
--button-background-color-primary-hover: var(--button-active-bgcolor) !important; /* Primary button background on 'hover' */
83+
--button-background-color-primary-active: var(--button-hover-bgcolor) !important; /* Primary button background on 'active' */
8584

8685
--button-text-color-primary: var(--in-content-text-color) !important;
8786

@@ -105,35 +104,38 @@ window, dialog, .dialogBox {
105104
:root {
106105
--contrast-color: #ffffff !important; /* Contrast background color */
107106
--border-contrast-color: #000000 !important; /* Contrast border color */
108-
--background-color-canvas: #121018 !important; /* Bakground color */
107+
--in-content-page-background: #121018 !important; /* Bakground color */
108+
--background-color-canvas: #090911 !important; /* 'about:' background */
109109

110110
--in-content-box-background: #15151e !important; /* Color of textboxes and background of drop-down menus */
111111
--in-content-box-border-color: #272b37 !important; /* Textbox border color */
112112
}
113113

114114
/* Pop-up window background in 'settings' */
115-
.dialogBox { --background-color-canvas: #1a1a24 !important; }
115+
.dialogBox { --in-content-page-background: #1a1a24 !important; }
116116
}
117117

118118
@media (prefers-color-scheme: light) {
119119
:root{
120120
--contrast-color: #000000 !important; /* Contrast background color */
121121
--border-contrast-color: #ffffff !important; /* Contrast border color */
122-
--background-color-canvas: #f9f9f9 !important; /* Bakground color */
122+
--in-content-page-background: #f9f9f9 !important; /* Bakground color */
123+
--background-color-canvas: #f0f0f0 !important; /* 'about:' background */
123124

124125
--in-content-box-background: #f9f9fb !important; /* Color of textboxes and background of drop-down menus */
125126
--in-content-box-border-color: #d4cfe7 !important; /* Textbox border color */
126127
}
127128

128129
/* Pop-up window background in 'settings' */
129-
.dialogBox {--background-color-canvas: #f9f9f9 !important;}
130+
.dialogBox {--in-content-page-background: #f9f9f9 !important;}
130131
}
131132

132133
/* _____________________________________ Various colors of the 'Add-ons' and 'Preferences' interface _____________________________________ */
133134

134-
@-moz-document url-prefix(about:preferences), url-prefix(about:addons), url-prefix(about:support), url-prefix(about:profiles) , url-prefix(about:debugging), url-prefix(about:welcome) {
135+
@-moz-document url-prefix(about:preferences), url-prefix(about:settings), url-prefix(about:addons),
136+
url-prefix(about:support), url-prefix(about:profiles) , url-prefix(about:debugging), url-prefix(about:welcome) {
135137

136-
:root { --opaque: color-mix(in srgb, var(--background-color-canvas) 50%, transparent) !important; }
138+
:root { --opaque: color-mix(in srgb, var(--in-content-page-background) 50%, transparent) !important; }
137139

138140
/* Informative messages */
139141

@@ -394,7 +396,7 @@ window, dialog, .dialogBox {
394396
max-height: 100vh;
395397
display: grid !important;
396398
grid-template-rows: auto auto 1fr;
397-
--background-color-canvas: transparent;
399+
--in-content-page-background: transparent;
398400
}
399401

400402
#main {

‎chrome/components/ogx_hamburger-menu.css‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767

6868
/* margin to the left of 'menubar-tabsbar-navbar' when new menu is disabled */
6969

70-
:root:not([chromehidden~="toolbar"]):has(#PersonalToolbar:not([collapsed])) {
70+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]):has(#PersonalToolbar:not([collapsed])) {
7171
& #toolbar-menubar{
7272
padding-inline-start: var(--padding-left-tab) !important;
7373
}
@@ -82,7 +82,7 @@
8282

8383
@media -moz-pref("sidebar.revamp") and -moz-pref("sidebar.position_start") and (not -moz-pref("firefoxgx.left-sidebar")) {
8484

85-
:root:not([chromehidden~="toolbar"],[sizemode="fullscreen"]):not(:has(#sidebar-main[hidden],sidebar-main[hidden])) {
85+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"],[sizemode="fullscreen"]):not(:has(#sidebar-main[hidden],sidebar-main[hidden])) {
8686
--my-vertical-elements-width: calc(var(--my-vertical-toolbar-width) - 1px) !important;
8787
--my-elements-left-margin: var(--my-vertical-elements-width) !important;
8888
}
@@ -130,7 +130,7 @@
130130

131131
@media (-moz-platform: windows), (-moz-platform: linux) {
132132

133-
:root:not([chromehidden~="toolbar"],[sizemode="fullscreen"]):has(#toolbar-menubar:not([autohide])) {
133+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"],[sizemode="fullscreen"]):has(#toolbar-menubar:not([autohide])) {
134134

135135
& #PanelUI-button,
136136
& #appMenu-popup {
@@ -174,7 +174,7 @@
174174
padding-inline-start: var(--padding-left-tab, var(--my-vertical-toolbar-width)) !important;
175175
}
176176

177-
:root:not([chromehidden~="toolbar"]) {
177+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]) {
178178

179179
/* Menu button style and margins */
180180

@@ -248,7 +248,7 @@
248248

249249
/* _______________________ Styles Menu[open] Popup _______________________ */
250250

251-
:root:not([chromehidden~="toolbar"],[sizemode="normal"]) {
251+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"],[sizemode="normal"]) {
252252

253253
/* Space for 'logo + menuLabel' inside popup */
254254

@@ -331,7 +331,7 @@
331331
/* Remove unwanted margin of menupopup just in linux */
332332

333333
@media (-moz-platform: linux) {
334-
:root:not([chromehidden~="toolbar"],[sizemode="normal"]) {
334+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"],[sizemode="normal"]) {
335335
& #appMenu-popup {
336336
--removed-panel-shadow-margin: 0px !important;
337337
}
@@ -345,7 +345,7 @@
345345

346346
@media -moz-pref("firefoxgx.left-sidebar") and -moz-pref("browser.toolbars.bookmarks.visibility", 'always') {
347347

348-
:root:not([chromehidden~="toolbar"]) {
348+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]) {
349349

350350
/* New Menu height */
351351

@@ -370,7 +370,7 @@
370370

371371
@media (not -moz-pref("firefoxgx.left-sidebar")) and (-moz-pref("sidebar.revamp") and -moz-pref("sidebar.position_start")) {
372372

373-
:root:not([chromehidden~="toolbar"],[customizing]):not(:has(#sidebar-main[hidden],sidebar-main[hidden])) {
373+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"],[customizing]):not(:has(#sidebar-main[hidden],sidebar-main[hidden])) {
374374
--my-menu-button-height: var(--menubar-height-personal, var(--toolbar-height-personal)) !important; /* New Menu height */
375375
--my-elements-left-margin: var(--padding-left-tab, var(--my-vertical-toolbar-width)) !important;
376376
}
@@ -389,15 +389,15 @@
389389
(-moz-pref("sidebar.revamp") and -moz-pref("sidebar.position_start")),
390390
(-moz-pref("sidebar.verticalTabs") and -moz-pref("sidebar.position_start")) {
391391

392-
:root:not([chromehidden~="toolbar"]) {
392+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]) {
393393
--padding-left-tab: calc(var(--my-vertical-toolbar-width) - 1px) !important; /* New size of the 'menu' button */
394394
--margin-left-icons-personal: calc(var(--my-vertical-toolbar-width) / 2 - 14px) !important; /* New margin-left for menu items */
395395
--margin-right-icons-personal: 2px !important; /* New margin-right for menu items */
396396
}
397397

398398
@media (-moz-platform: windows), (-moz-platform: linux) {
399399

400-
:root:not([chromehidden~="toolbar"]) {
400+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]) {
401401

402402
/* Menu button when 'hover' */
403403

@@ -448,7 +448,7 @@
448448
padding-top: var(--windowed-top-padding, 0px) !important;
449449
}
450450

451-
:root:not([chromehidden~="toolbar"]) {
451+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]) {
452452

453453
/* position when: [normal] + small window width */
454454

@@ -470,14 +470,14 @@
470470

471471
@media (-moz-platform: windows), (-moz-platform: linux) {
472472

473-
:root:not([chromehidden~="toolbar"]) {
473+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]) {
474474

475475
--my-menu-button-height: var(--toolbar-height-personal) !important; /* New Menu height */
476476
--padding-left-tab: var(--my-vertical-elements-width) !important; /* Menu with smaller */
477477
--margin-left-icons-personal: calc(var(--my-vertical-toolbar-width) / 2 - 14px) !important; /* New margin-left for menu items */
478478
}
479479

480-
:root:not([chromehidden~="toolbar"]) {
480+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]) {
481481

482482
/* Menubar margin left */
483483
#toolbar-menubar[autohide]>toolbaritem>menubar {
@@ -497,7 +497,7 @@
497497

498498
/* Vertical-tabs hidden */
499499

500-
:root:not([chromehidden~="toolbar"]):has(#sidebar-main[hidden],sidebar-main[hidden]) {
500+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]):has(#sidebar-main[hidden],sidebar-main[hidden]) {
501501

502502
#toolbar-menubar[autohide] ~ #nav-bar {
503503
padding-inline-start: var(--my-vertical-elements-width) !important;
@@ -522,7 +522,7 @@
522522

523523
@media not -moz-pref("browser.toolbars.bookmarks.visibility", 'always') {
524524

525-
:root:not([chromehidden~="toolbar"]) {
525+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]) {
526526

527527
/* Navbar left-margin */
528528
#toolbar-menubar[autohide] ~ #nav-bar {
@@ -544,13 +544,13 @@
544544

545545
@media -moz-pref("sidebar.verticalTabs") and (not -moz-pref("sidebar.position_start")) {
546546

547-
:root:not([chromehidden~="toolbar"]) {
547+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]) {
548548
--my-menu-button-height: var(--toolbar-height-personal) !important; /* New Menu height */
549549
}
550550

551551
/* Menu space in the nav-bar */
552552

553-
:root:not([chromehidden~="toolbar"]) #toolbar-menubar[autohide] ~ #nav-bar {
553+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]) #toolbar-menubar[autohide] ~ #nav-bar {
554554
--my-elements-left-margin: calc(var(--padding-left-tab,0px) + var(--uc-window-drag-space-pre, 0px)) !important;
555555
}
556556

@@ -565,7 +565,7 @@
565565
}
566566

567567
@media (-moz-platform: windows), (-moz-platform: linux) {
568-
:root:not([chromehidden~="toolbar"]) {
568+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]) {
569569

570570
/* Menu button display into nav-bar */
571571
#PanelUI-button {
@@ -585,7 +585,7 @@
585585

586586
@media (-moz-platform: windows), (-moz-platform: linux) {
587587

588-
:root:not([chromehidden~="toolbar"]) {
588+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"]) {
589589

590590
--my-menu-button-height: var(--menubar-height-personal, var(--toolbar-height-personal)) !important; /* New Menu height */
591591

‎chrome/components/ogx_left-sidebar.css‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
margin-inline: 0 !important;
7878
}
7979

80-
:root:not([chromehidden~="toolbar"],[inDOMFullscreen],[sizemode="fullscreen"]) {
80+
:root:not([chromehidden~="toolbar"],[chromehidden*="menubar"], [inDOMFullscreen],[sizemode="fullscreen"]) {
8181
&>body>#browser,
8282
&>body>#browser-bottombox,
8383
&>body>#customization-container {
@@ -501,7 +501,7 @@
501501
--space-before-gradient-line: calc(var(--windowed-top-padding, 0px) + var(--menubar-height-personal,0px) + var(--tab-height-personal)) !important;
502502
}
503503

504-
#navigator-toolbox::before {
504+
:root:not([chromehidden*="menubar"]) #navigator-toolbox::before {
505505
content:"";
506506
position: absolute;
507507
bottom: 0px;
@@ -681,6 +681,9 @@
681681

682682
/* ___________________ Some extensions icons ____________________
683683
¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ */
684+
685+
/* Gx Theme Styles Extension */
686+
moz-button[extensionId="GXThemeStyles@Godie"] { --my-custom-image: url("../icons/logo_gx-theme-styles.svg") !important; }
684687

685688
/* Whatsapp Extension */
686689
moz-button[extensionId="ChatwappInSidebar@Godie"] { --my-custom-image: url("../icons/logo_whatsapp.svg") !important; }
@@ -1230,4 +1233,20 @@
12301233
box-shadow: none !important;
12311234
}/**/
12321235
}
1236+
}
1237+
1238+
/* Add border top of web content and remove it in some 'about:' pages */
1239+
:root:has(.tabbrowser-tab[selected][label="Firefox View"]),
1240+
:root:has(.tabbrowser-tab[selected] :is(
1241+
.tab-icon-image[src="chrome://mozapps/skin/extensions/extension.svg"],
1242+
.tab-icon-image[src="chrome://global/skin/icons/settings.svg"],
1243+
.tab-icon-image[src="chrome://global/skin/icons/developer.svg"],
1244+
.tab-icon-image[src="chrome://branding/content/icon32.png"],
1245+
.tab-icon-image[src="chrome://global/skin/icons/performance.svg"])){
1246+
1247+
--my-content-border-color: transparent !important; /* Border color for web content is some situations */
1248+
}
1249+
1250+
#tabbrowser-tabbox {
1251+
box-shadow: 0 -1px var(--my-content-border-color) !important;
12331252
}

‎chrome/components/ogx_main-image.css‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@
5353
:root:is([lwtheme-image],[style*="--lwt-additional-images"]) {
5454
--lwt-header-image: var(--lwt-main-image) !important;
5555
--lwt-additional-images: var(--lwt-main-image) !important;
56-
57-
& #tabbrowser-tabbox,
58-
& #sidebar-box[checked] {
59-
--my-content-border-color: color-mix(in srgb, var(--toolbar-bgcolor) 80%, var(--tab-selected-textcolor)) !important; /* Border around web content */
60-
}
6156
}
6257

6358
/* Set the main image to all body */
@@ -67,22 +62,25 @@
6762
}
6863

6964
/* blur effect
70-
body::before {
65+
body::after {
7166
content: '';
7267
display: flex;
7368
position: fixed;
7469
width: 100%;
7570
height: 100%;
7671
backdrop-filter: blur(34px);
72+
z-index: -1;
7773
mask: radial-gradient(ellipse at center, #e66465, #00000020),
7874
radial-gradient(ellipse at bottom, #4d9f0c, transparent
7975
);
8076
}*/
81-
82-
body::after {
77+
78+
/* Remove main gradient background */
79+
80+
#main-window>body:before {
8381
display: none !important;
8482
}
85-
83+
8684
/* Align tab-background image */
8785

8886
.tabbrowser-tab:is([visuallyselected],[multiselected]) .tab-background {

0 commit comments

Comments
 (0)