From d64e9e129e42d31a9c2362061e1aa153379099d1 Mon Sep 17 00:00:00 2001 From: MrOtherGuy Date: Sun, 21 Nov 2021 08:03:05 +0200 Subject: [PATCH] add temporary dummy variables to support for window frame color In 96 the old --lwt-accent-color is renamed to --lwt-frame so add some compatibility rules for now. --- chrome/autohide_toolbox.css | 5 ++++- chrome/color_variable_template.css | 2 +- chrome/fake_statusbar_w_menubar.css | 7 +++++-- chrome/multi-row_bookmarks.css | 5 ++++- chrome/multi-row_tabs_below_content.css | 8 ++++---- chrome/tabs_animated_gradient_border.css | 7 +++++-- chrome/tabs_below_content.css | 6 +++--- chrome/toolbars_below_content.css | 6 +++++- chrome/vertical_menubar.css | 5 ++++- chrome/vertical_popup_menubar.css | 5 ++++- 10 files changed, 39 insertions(+), 17 deletions(-) diff --git a/chrome/autohide_toolbox.css b/chrome/autohide_toolbox.css index 5d0e4fe..63afdda 100644 --- a/chrome/autohide_toolbox.css +++ b/chrome/autohide_toolbox.css @@ -15,6 +15,9 @@ See the above repository for updates as well as full license text. */ --uc-toolbox-rotation: 89deg; } +/* Dummy variable to support versions 94-96, can be removed when 96 lands */ +:root{ --lwt-frame: var(--lwt-accent-color) } + @media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){ :root[tabsintitlebar][sizemode="maximized"]:not([inDOMFullscreen]) > body > box{ margin-top: 8px !important; } @@ -38,7 +41,7 @@ See the above repository for updates as well as full license text. */ #navigator-toolbox{ position: fixed !important; display: block; - background-color: var(--lwt-accent-color,black) !important; + background-color: var(--lwt-frame,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 b1352c5..626289e 100644 --- a/chrome/color_variable_template.css +++ b/chrome/color_variable_template.css @@ -9,7 +9,7 @@ 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-accent-color: purple !important; + --lwt-frame: purple !important; --toolbar-bgcolor: rgba(0,0,0,0.4) !important; /* tabs */ --lwt-text-color: cyan !important; diff --git a/chrome/fake_statusbar_w_menubar.css b/chrome/fake_statusbar_w_menubar.css index 9a4e833..42fa757 100644 --- a/chrome/fake_statusbar_w_menubar.css +++ b/chrome/fake_statusbar_w_menubar.css @@ -22,6 +22,9 @@ 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) } + :root{ --uc-fake-titlebar-padding: 0px } @media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){ :root[sizemode="maximized"][tabsintitlebar]{ --uc-fake-titlebar-padding: 8px } @@ -36,7 +39,7 @@ See the above repository for updates as well as full license text. */ position: fixed; display: flex; width: 100vw; - background-color: var(--lwt-accent-color); + background-color: var(--lwt-frame); } #TabsToolbar{ @@ -72,7 +75,7 @@ See the above repository for updates as well as full license text. */ #statuspanel-inner > #statuspanel-label{ height:3em; min-width: 1000px; - background-color: var(--lwt-accent-color, hsla(0,0%,100%,.8)) !important; + background-color: var(--lwt-frame, 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 404beeb..1b08ea5 100755 --- a/chrome/multi-row_bookmarks.css +++ b/chrome/multi-row_bookmarks.css @@ -3,6 +3,9 @@ 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 */ @@ -20,7 +23,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-accent-color) var(--toolbar-bgcolor) ; + scrollbar-color: var(--lwt-frame) 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 ddb768e..310c5f1 100644 --- a/chrome/multi-row_tabs_below_content.css +++ b/chrome/multi-row_tabs_below_content.css @@ -15,8 +15,8 @@ See the above repository for updates as well as full license text. */ @-moz-document url(chrome://browser/content/browser.xhtml){ - /* Dummy variable to support both versions 89-90 */ - :root{ --tab-block-margin: var(--proton-tab-block-margin) } + /* 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; @@ -111,7 +111,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-accent-color) 35px); + background-image: linear-gradient( to left,transparent,var(--lwt-frame) 35px); } #toolbar-menubar > .titlebar-buttonbox-container{ background: var(--toolbar-bgcolor); } @@ -184,7 +184,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-accent-color) !important; } + #tabbrowser-tabpanels{ background-color: var(--lwt-frame) !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 bc68077..3acea45 100644 --- a/chrome/tabs_animated_gradient_border.css +++ b/chrome/tabs_animated_gradient_border.css @@ -6,6 +6,9 @@ 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) } + /* Thanks to /u/skenera on reddit for suggesting animating background position and using steps() function to reduce cpu load */ @@ -31,7 +34,7 @@ Thanks to /u/skenera on reddit for suggesting animating background position and content: ""; display: -moz-box; -moz-box-flex: 1 !important; - background-color: var(--lwt-accent-color); + background-color: var(--lwt-frame); margin-bottom: 2px; } @@ -42,7 +45,7 @@ Thanks to /u/skenera on reddit for suggesting animating background position and #tabbrowser-tabs .scrollbutton-up, #tabbrowser-tabs .scrollbutton-down, #tabbrowser-tabs ~ toolbarbutton{ - background-color: var(--lwt-accent-color) !important; + background-color: var(--lwt-frame) !important; margin-bottom: 2px !important; opacity: 1 !important; } diff --git a/chrome/tabs_below_content.css b/chrome/tabs_below_content.css index ac90f6d..f034f72 100644 --- a/chrome/tabs_below_content.css +++ b/chrome/tabs_below_content.css @@ -10,8 +10,8 @@ Additionally on Linux, you may need to get: linux_gtk_window_control_patch.css */ -/* Dummy variable to support both versions 89-90 */ -:root{ --tab-block-margin: var(--proton-tab-block-margin) } +/* 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; @@ -53,7 +53,7 @@ linux_gtk_window_control_patch.css } #TabsToolbar:hover{ z-index: 1 } -#TabsToolbar{ background-color: var(--lwt-accent-color); } +#TabsToolbar{ background-color: var(--lwt-frame); } #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 1f43a52..acf137f 100644 --- a/chrome/toolbars_below_content.css +++ b/chrome/toolbars_below_content.css @@ -6,6 +6,10 @@ See the above repository for updates as well as full license text. */ /* By default, menubar will stay on top with two options to select it's behavior - see below */ @-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; } @media (-moz-os-version: windows-win10){ @@ -56,7 +60,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-accent-color,black); } + #toolbar-menubar{ z-index: 1; background-color: var(--lwt-frame,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 f5a7b2a..eff342c 100644 --- a/chrome/vertical_menubar.css +++ b/chrome/vertical_menubar.css @@ -8,6 +8,9 @@ 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:not([customizing]) #titlebar{ position: fixed; display: block; @@ -48,7 +51,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: -60px; - background-color: var(--lwt-accent-color) + background-color: var(--lwt-frame) } :root:not([inDOMFullscreen]) > #content-deck,:root:not([inDOMFullscreen]) #browser{ margin-right: 30px } diff --git a/chrome/vertical_popup_menubar.css b/chrome/vertical_popup_menubar.css index 6fb76fd..c20fa75 100644 --- a/chrome/vertical_popup_menubar.css +++ b/chrome/vertical_popup_menubar.css @@ -7,6 +7,9 @@ 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; @@ -20,7 +23,7 @@ menubar:hover > menu, display: block; position: fixed; z-index: 10; - background-color: var(--lwt-accent-color); + background-color: var(--lwt-frame); inset-inline-start: 0; } menubar{ -moz-box-orient: vertical; }