From c79cfaf813464466d5970d6f0e52ac8f5bb0a432 Mon Sep 17 00:00:00 2001 From: MrOtherGuy Date: Sat, 9 Dec 2023 16:35:39 +0200 Subject: [PATCH] Remove fx 119 specific light-dark() workarounds --- chrome/autohide_bookmarks_toolbar.css | 10 ---------- chrome/floating_findbar_on_top.css | 13 +------------ chrome/hide_tabs_toolbar.css | 10 ---------- chrome/hide_tabs_with_one_tab.css | 10 ---------- chrome/multi-row_tabs_below_content.css | 10 ---------- chrome/status_inside_urlbar.css | 11 +---------- chrome/status_inside_urlbar_v2.css | 11 +---------- chrome/urlbar_popup_full_width.css | 15 --------------- 8 files changed, 3 insertions(+), 87 deletions(-) diff --git a/chrome/autohide_bookmarks_toolbar.css b/chrome/autohide_bookmarks_toolbar.css index 7c70daa..db7ca4f 100644 --- a/chrome/autohide_bookmarks_toolbar.css +++ b/chrome/autohide_bookmarks_toolbar.css @@ -32,16 +32,6 @@ See the above repository for updates as well as full license text. */ :root[uidensity="compact"] #PersonalToolbar{ --toolbarbutton-outer-padding: 1px !important; } -/* This is a workaround for fx 119 specifically for users that use default theme, should remove when 120 is released. See bug 1853524 */ -#PersonalToolbar:not(:-moz-lwtheme){ - --toolbar-bgcolor: #f9f9fb; -} -/* ...and for dark variant */ -@media (prefers-color-scheme: dark){ - #PersonalToolbar:not(:-moz-lwtheme){ - --toolbar-bgcolor: rgb(43, 42, 51); - } -} #PlacesToolbarItems > .bookmark-item, #OtherBookmarks, #PersonalToolbar > #import-button{ diff --git a/chrome/floating_findbar_on_top.css b/chrome/floating_findbar_on_top.css index b87e0bc..fb97ee2 100644 --- a/chrome/floating_findbar_on_top.css +++ b/chrome/floating_findbar_on_top.css @@ -36,18 +36,7 @@ findbar > .close-icon{ background-image: linear-gradient(var(--toolbar-bgcolor),var(--toolbar-bgcolor)),var(--lwt-header-image,none); pointer-events: auto; } -/* This is a workaround for fx 119 specifically for users that use default theme, should remove when 120 is released. See bug 1853524 */ -findbar:not(:-moz-lwtheme){ - --toolbar-bgcolor: #f9f9fb; - --chrome-content-separator-color: rgb(204, 204, 204); -} -/* ...and for dark variant */ -@media (prefers-color-scheme: dark){ - findbar:not(:-moz-lwtheme){ - --toolbar-bgcolor: rgb(43, 42, 51); - --chrome-content-separator-color: hsl(240, 5%, 5%); - } -} + findbar > .findbar-container{ border-bottom-right-radius: 4px; border-right-width: 1px; diff --git a/chrome/hide_tabs_toolbar.css b/chrome/hide_tabs_toolbar.css index 1a8a59c..257db60 100644 --- a/chrome/hide_tabs_toolbar.css +++ b/chrome/hide_tabs_toolbar.css @@ -53,13 +53,3 @@ Window controls will be all wrong without it pointer-events: none; margin-left: var(--uc-window-drag-space-pre,0px) } -/* This is a workaround for fx 119 specifically for users that use default theme, should remove when 120 is released. See bug 1853524 */ -:root:not(:-moz-lwtheme){ - --toolbar-non-lwt-bgcolor: #f9f9fb !important; -} -/* ...and for dark variant */ -@media (prefers-color-scheme: dark){ - :root:not(:-moz-lwtheme){ - --toolbar-non-lwt-bgcolor: rgb(43, 42, 51) !important; - } -} \ No newline at end of file diff --git a/chrome/hide_tabs_with_one_tab.css b/chrome/hide_tabs_with_one_tab.css index c60646e..fb811ef 100644 --- a/chrome/hide_tabs_with_one_tab.css +++ b/chrome/hide_tabs_with_one_tab.css @@ -40,16 +40,6 @@ This will NOT work correctly if you have hidden tabs such as with tab groups ext :where(#nav-bar){ border-inline: var(--uc-window-drag-space-width,0) solid var(--toolbar-bgcolor); } -/* This is a workaround for fx 119 specifically for users that use default theme, should remove when 120 is released. See bug 1853524 */ -:root:not(:-moz-lwtheme){ - --toolbar-bgcolor: #f9f9fb !important; -} -/* ...and for dark variant */ -@media (prefers-color-scheme: dark){ - :root:not(:-moz-lwtheme){ - --toolbar-bgcolor: rgb(43, 42, 51) !important; - } -} @media (-moz-platform: linux){ #TabsToolbar .titlebar-buttonbox{ align-items: stretch !important; diff --git a/chrome/multi-row_tabs_below_content.css b/chrome/multi-row_tabs_below_content.css index a6aa72e..00cdfc0 100644 --- a/chrome/multi-row_tabs_below_content.css +++ b/chrome/multi-row_tabs_below_content.css @@ -33,16 +33,6 @@ See the above repository for updates as well as full license text. */ #main-window[tabsintitlebar]{ background-color: var(--toolbar-bgcolor,accentcolor) !important;; } - /* This is a workaround for fx 119 specifically for users that use default theme, should remove when 120 is released. See bug 1853524 */ - #main-window[tabsintitlebar]:not(:-moz-lwtheme){ - --toolbar-bgcolor: #f9f9fb !important; - } - /* ...and for dark variant */ - @media (prefers-color-scheme: dark){ - #main-window[tabsintitlebar]:not(:-moz-lwtheme){ - --toolbar-bgcolor: rgb(43, 42, 51) !important; - } - } :root[uidensity="compact"]{ --multirow-toolbar-height: 34px } :root{ border-top-width: 0px !important } diff --git a/chrome/status_inside_urlbar.css b/chrome/status_inside_urlbar.css index 21f89b0..82d921c 100644 --- a/chrome/status_inside_urlbar.css +++ b/chrome/status_inside_urlbar.css @@ -60,16 +60,7 @@ As a workaround, the -moz-element background image is removed somewhat often whi } /* If you use a theme where urlbar is partially transparent you should edit this color to something that closely matches the perceived color of urlbar. Or perhaps use background-image - linear-gradient() can work well here. But keep the color or image opaque or otherwise you'll face an issue where urlbar text bleeds through */ #statuspanel{ background-color: var(--toolbar-bgcolor) } -/* This is a workaround for fx 119 specifically for users that use default theme, should remove when 120 is released. See bug 1853524 */ -#statuspanel:not(:-moz-lwtheme){ - background-color: #f9f9fb; -} -/* ...and for dark variant */ -@media (prefers-color-scheme: dark){ - #statuspanel:not(:-moz-lwtheme){ - background-color: rgb(43, 42, 51); - } -} + #statuspanel{ color: var(--toolbar-field-color, black); z-index: -1; diff --git a/chrome/status_inside_urlbar_v2.css b/chrome/status_inside_urlbar_v2.css index e81a07b..c46d150 100644 --- a/chrome/status_inside_urlbar_v2.css +++ b/chrome/status_inside_urlbar_v2.css @@ -51,16 +51,7 @@ As a workaround, the -moz-element background image is removed somewhat often whi /* If you use a theme where urlbar is partially transparent you should edit this color to something that closely matches the perceived color of urlbar. Or perhaps use background-image - linear-gradient() can work well here. But keep the color or image opaque or otherwise you'll face an issue where urlbar text bleeds through */ #statuspanel{ background-color: var(--toolbar-bgcolor) } -/* This is a workaround for fx 119 specifically for users that use default theme, should remove when 120 is released. See bug 1853524 */ -#statuspanel:not(:-moz-lwtheme){ - background-color: #f9f9fb; -} -/* ...and for dark variant */ -@media (prefers-color-scheme: dark){ - #statuspanel:not(:-moz-lwtheme){ - background-color: rgb(43, 42, 51); - } -} + #statuspanel{ color: var(--toolbar-field-color, black); z-index: -1; diff --git a/chrome/urlbar_popup_full_width.css b/chrome/urlbar_popup_full_width.css index 3a944e0..15559d3 100644 --- a/chrome/urlbar_popup_full_width.css +++ b/chrome/urlbar_popup_full_width.css @@ -51,18 +51,3 @@ See the above repository for updates as well as full license text. */ /* This may seem pretty weird, but it gets around an issue where the height of urlbar may suddenly change when one starts typing into it */ /* If you are otherwise modifying the urlbar height then you might need to modify the height of this too */ #urlbar > #urlbar-input-container::before{ content: ""; display: flex; height: 24px; } - -/* This is a workaround for fx 119 specifically for users that use default theme, should remove when 120 is released. See bug 1853524 */ -#urlbar:not(:-moz-lwtheme){ - --toolbar-bgcolor: #f9f9fb; - --toolbar-field-background-color: rgb(240, 240, 244); - --toolbar-field-focus-background-color: white; -} -/* ...and for dark variant */ -@media (prefers-color-scheme: dark){ - #urlbar:not(:-moz-lwtheme){ - --toolbar-bgcolor: rgb(43, 42, 51); - --toolbar-field-background-color: rgb(28, 27, 34); - --toolbar-field-focus-background-color: rgb(66, 65, 77) - } -}