From 62f0d91975772e4894f8072cbfc2f5341e231cdf Mon Sep 17 00:00:00 2001 From: MrOtherGuy Date: Sat, 19 Nov 2022 10:22:05 +0200 Subject: [PATCH] remove remaining --lwt-frame variables from the codebase --- chrome/autohide_toolbox.css | 5 +---- chrome/color_variable_template.css | 1 - chrome/fake_statusbar_w_menubar.css | 7 ++----- chrome/multi-row_bookmarks.css | 5 +---- chrome/multi-row_tabs_below_content.css | 7 ++----- chrome/tabs_animated_gradient_border.css | 9 +++------ chrome/tabs_below_content.css | 5 +---- chrome/toolbars_below_content.css | 5 +---- chrome/vertical_menubar.css | 7 ++----- chrome/vertical_popup_menubar.css | 5 +---- 10 files changed, 14 insertions(+), 42 deletions(-) diff --git a/chrome/autohide_toolbox.css b/chrome/autohide_toolbox.css index df5d8af..500ac11 100644 --- a/chrome/autohide_toolbox.css +++ b/chrome/autohide_toolbox.css @@ -15,9 +15,6 @@ See the above repository for updates as well as full license text. */ --uc-toolbox-rotation: 88.5deg; } -/* Dummy variable to support versions 94-96, can be removed when 96 lands */ -:root{ --lwt-frame: var(--lwt-accent-color) } - @media (-moz-platform: windows), (-moz-os-version: windows-win7), (-moz-os-version: windows-win10){ @@ -31,7 +28,7 @@ See the above repository for updates as well as full license text. */ #navigator-toolbox{ position: fixed !important; display: block; - background-color: var(--lwt-frame,black) !important; + background-color: var(--lwt-accent-color,black) !important; transition: transform 82ms linear, opacity 82ms linear !important; transition-delay: var(--uc-autohide-toolbox-delay) !important; transform-origin: top; diff --git a/chrome/color_variable_template.css b/chrome/color_variable_template.css index 7f67862..d7d0f7c 100644 --- a/chrome/color_variable_template.css +++ b/chrome/color_variable_template.css @@ -9,7 +9,6 @@ See the above repository for updates as well as full license text. */ --arrowpanel-color: cyan !important; --arrowpanel-dimmed: rgba(0,0,0,0.4) !important; /* window and toolbar background */ - --lwt-frame: red !important; /* pre fx94 */ --lwt-accent-color: red !important; --lwt-accent-color-inactive: green !important; --toolbar-bgcolor: rgba(0,0,0,0.4) !important; diff --git a/chrome/fake_statusbar_w_menubar.css b/chrome/fake_statusbar_w_menubar.css index 56bdcf1..0bd963f 100644 --- a/chrome/fake_statusbar_w_menubar.css +++ b/chrome/fake_statusbar_w_menubar.css @@ -22,9 +22,6 @@ See the above repository for updates as well as full license text. */ visibility: visible; }*/ - /* Dummy variable to support versions 94-96, can be removed when 96 lands */ - :root{ --lwt-frame: var(--lwt-accent-color) } - #navigator-toolbox{ margin-top: calc(var(--tab-min-height) + 2 * var(--tab-block-margin,0px)) } @@ -35,7 +32,7 @@ See the above repository for updates as well as full license text. */ position: fixed; display: flex; width: 100vw; - background-color: var(--lwt-frame); + background-color: var(--lwt-accent-color); } #TabsToolbar{ @@ -71,7 +68,7 @@ See the above repository for updates as well as full license text. */ #statuspanel-label{ height:3em; min-width: 1000px; - background-color: var(--lwt-frame, hsla(0,0%,100%,.8)) !important; + background-color: var(--lwt-accent-color, hsla(0,0%,100%,.8)) !important; border: none !important; font-size: inherit; color: inherit !important; diff --git a/chrome/multi-row_bookmarks.css b/chrome/multi-row_bookmarks.css index e3bc04e..51c85e4 100755 --- a/chrome/multi-row_bookmarks.css +++ b/chrome/multi-row_bookmarks.css @@ -3,9 +3,6 @@ See the above repository for updates as well as full license text. */ /* Makes bookmarks toolbar span multiple rows */ -/* Dummy variable to support versions 94-96, can be removed when 96 lands */ -:root{ --lwt-frame: var(--lwt-accent-color) } - #PersonalToolbar{ --multirow-bmb-n-rows: 3; /* Control how many rows are shown before scrolling */ --multirow-bmb-row-margin: 2px; /* Control how much spacing is between rows */ @@ -23,7 +20,7 @@ See the above repository for updates as well as full license text. */ /* --uc-bm-padding is defined in autohide_bookmarks_toolbar.css */ max-height: calc(var(--multirow-bmb-n-rows) * (4px + 1em + (2 * (var(--multirow-bmb-row-margin) + var(--uc-bm-padding,var(--bookmark-block-padding)))))) !important; overflow-y:auto; - scrollbar-color: var(--lwt-frame) var(--toolbar-bgcolor) ; + scrollbar-color: var(--lwt-accent-color) var(--toolbar-bgcolor) ; scrollbar-width: thin; } diff --git a/chrome/multi-row_tabs_below_content.css b/chrome/multi-row_tabs_below_content.css index 823c4c4..90f2048 100644 --- a/chrome/multi-row_tabs_below_content.css +++ b/chrome/multi-row_tabs_below_content.css @@ -18,9 +18,6 @@ See the above repository for updates as well as full license text. */ @-moz-document url(chrome://browser/content/browser.xhtml){ - /* Dummy variable to support versions 94-96, can be removed when 96 lands */ - :root{ --lwt-frame: var(--lwt-accent-color) } - :root{ --multirow-toolbar-height: 40px; --multirow-top-padding: 0px; @@ -119,7 +116,7 @@ See the above repository for updates as well as full license text. */ #toolbar-menubar:hover{ z-index: 2 } #toolbar-menubar:hover > #menubar-items{ visibility: visible; - background-image: linear-gradient( to left,transparent,var(--lwt-frame) 35px); + background-image: linear-gradient( to left,transparent,var(--lwt-accent-color) 35px); } #toolbar-menubar > .titlebar-buttonbox-container{ @@ -195,7 +192,7 @@ See the above repository for updates as well as full license text. */ .tabbrowser-tab > stack{ width: 100%; height: 100%; } /* This should fix potential flash that could occur when bottom border is hovered to show tabs in fullscreen mode */ - #tabbrowser-tabpanels{ background-color: var(--lwt-frame) !important; } + #tabbrowser-tabpanels{ background-color: var(--lwt-accent-color) !important; } /* remove bottom margin so it doesn't throw off row height computation */ #tabs-newtab-button{ margin-bottom: 0 !important; } diff --git a/chrome/tabs_animated_gradient_border.css b/chrome/tabs_animated_gradient_border.css index 51687e5..ae89f46 100644 --- a/chrome/tabs_animated_gradient_border.css +++ b/chrome/tabs_animated_gradient_border.css @@ -9,9 +9,6 @@ See the above repository for updates as well as full license text. */ /* Constant animation WILL increase CPU usage */ -/* Dummy variable to support versions 94-96, can be removed when 96 lands */ -:root{ --lwt-frame: var(--lwt-accent-color) } - @media (-moz-platform: windows){ /* Increase tab minimum height by 2px on Windows as a workaround for titlebar being unable to collapse below 31px height */ :root[uidensity="compact"]{ --tab-min-height: 31px !important; } @@ -47,7 +44,7 @@ Thanks to /u/skenera on reddit for suggesting animating background position and display: -moz-box; -moz-box-flex: 1 !important; position: relative; - background-color: var(--lwt-frame); + background-color: var(--lwt-accent-color); margin-bottom: 1px; } @@ -59,7 +56,7 @@ Thanks to /u/skenera on reddit for suggesting animating background position and #scrollbutton-up, #scrollbutton-down, #tabbrowser-tabs ~ toolbarbutton{ - background-color: var(--lwt-frame) !important; + background-color: var(--lwt-accent-color) !important; margin-bottom: 1px !important; opacity: 1 !important; position: relative; @@ -67,7 +64,7 @@ Thanks to /u/skenera on reddit for suggesting animating background position and .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected]), .tab-background[multiselected]:not([selected]){ background-image: linear-gradient(color-mix(in srgb, currentColor 11%, transparent),color-mix(in srgb, currentColor 11%, transparent)) !important; - background-color: var(--lwt-frame) !important; + background-color: var(--lwt-accent-color) !important; } .tabbrowser-tab:not([selected]){ min-height: calc(var(--tab-min-height) - 1px) !important; } diff --git a/chrome/tabs_below_content.css b/chrome/tabs_below_content.css index 4dbc159..30295a8 100644 --- a/chrome/tabs_below_content.css +++ b/chrome/tabs_below_content.css @@ -10,9 +10,6 @@ Additionally on Linux, you may need to get: linux_gtk_window_control_patch.css */ -/* Dummy variable to support versions 94-96, can be removed when 96 lands */ -:root{ --lwt-frame: var(--lwt-accent-color) } - .titlebar-buttonbox-container{ position: fixed; display: block; @@ -52,7 +49,7 @@ linux_gtk_window_control_patch.css } #TabsToolbar:hover{ z-index: 1 } -#TabsToolbar{ background-color: var(--lwt-frame); } +#TabsToolbar{ background-color: var(--lwt-accent-color); } #TabsToolbar-customization-target{ width: 100vw; } .tab-background{ border-top-style: none !important; } diff --git a/chrome/toolbars_below_content.css b/chrome/toolbars_below_content.css index f862039..3a3e057 100644 --- a/chrome/toolbars_below_content.css +++ b/chrome/toolbars_below_content.css @@ -7,9 +7,6 @@ See the above repository for updates as well as full license text. */ @-moz-document url(chrome://browser/content/browser.xhtml){ - /* Dummy variable to support versions 94-96, can be removed when 96 lands */ - :root{ --lwt-frame: var(--lwt-accent-color) } - #titlebar{ -moz-appearance: none !important; } #navigator-toolbox > div{ display: contents } @@ -60,7 +57,7 @@ See the above repository for updates as well as full license text. */ /* These three rules exist for compatibility with autohide_toolbox.css */ #navigator-toolbox{ bottom: 0px; transform-origin: bottom } #main-window > body > box{ margin-top: 0 !important; } - #toolbar-menubar{ z-index: 1; background-color: var(--lwt-frame,black); } + #toolbar-menubar{ z-index: 1; background-color: var(--lwt-accent-color,black); } /************** Menubar options - By default, menubar is overlayed on top of web-content diff --git a/chrome/vertical_menubar.css b/chrome/vertical_menubar.css index 5ecc771..61d858d 100644 --- a/chrome/vertical_menubar.css +++ b/chrome/vertical_menubar.css @@ -8,9 +8,6 @@ See the above repository for updates as well as full license text. */ @-moz-document url(chrome://browser/content/browser.xhtml){ - /* Dummy variable to support versions 94-96, can be removed when 96 lands */ - :root{ --lwt-frame: var(--lwt-accent-color) } - :root{ --uc-vertical-menubar-width: 36px; } @@ -46,7 +43,7 @@ See the above repository for updates as well as full license text. */ width: var(--uc-vertical-menubar-width); -moz-box-orient: vertical; flex-grow: 1; - background-color: var(--lwt-frame); + background-color: var(--lwt-accent-color); } #toolbar-menubar > .titlebar-buttonbox-container, @@ -60,7 +57,7 @@ See the above repository for updates as well as full license text. */ #toolbar-menubar:not([customizing]) #main-menubar{ -moz-box-orient: vertical; margin-left: -40px; - background-color: var(--lwt-frame); + background-color: var(--lwt-accent-color); } :root:not([inDOMFullscreen]) #browser{ margin-right: var(--uc-vertical-menubar-width) } diff --git a/chrome/vertical_popup_menubar.css b/chrome/vertical_popup_menubar.css index c20fa75..6fb76fd 100644 --- a/chrome/vertical_popup_menubar.css +++ b/chrome/vertical_popup_menubar.css @@ -7,9 +7,6 @@ See the above repository for updates as well as full license text. */ * Does NOT support toolbar buttons/items in menubar when in disabled mode. */ -/* Dummy variable to support versions 94-96, can be removed when 96 lands */ -:root{ --lwt-frame: var(--lwt-accent-color) } - #toolbar-menubar{ --uc-menubaritem-height: 28px; --uc-menubaritem-width: 40px; @@ -23,7 +20,7 @@ menubar:hover > menu, display: block; position: fixed; z-index: 10; - background-color: var(--lwt-frame); + background-color: var(--lwt-accent-color); inset-inline-start: 0; } menubar{ -moz-box-orient: vertical; }