From efb487a907fbf5d1f3e55a855e1da41007afe50a Mon Sep 17 00:00:00 2001 From: Vince Date: Sat, 12 Nov 2022 01:06:59 +0800 Subject: [PATCH] Fixed firefox 106 issues --- .../firefox/Monterey/parts/tabsbar-alt.css | 35 +++++++++++++++- src/other/firefox/Monterey/parts/tabsbar.css | 18 ++++++++ src/other/firefox/WhiteSur/parts/tabsbar.css | 42 ++++++++++++++----- 3 files changed, 83 insertions(+), 12 deletions(-) diff --git a/src/other/firefox/Monterey/parts/tabsbar-alt.css b/src/other/firefox/Monterey/parts/tabsbar-alt.css index dda161a9..1bdd66ab 100644 --- a/src/other/firefox/Monterey/parts/tabsbar-alt.css +++ b/src/other/firefox/Monterey/parts/tabsbar-alt.css @@ -14,8 +14,13 @@ /* Tabs bar height */ #tabbrowser-tabs, #tabbrowser-tabs arrowscrollbox { - height: initial !important; - min-height: initial !important; + height: 36px !important; + min-height: 36px !important; + --tab-min-height: 36px !important; +} + +.tab-background, .tab-stack { + min-height: 36px !important; } tab > stack { @@ -243,6 +248,7 @@ tab > stack { #tabs-newtab-button, #TabsToolbar #new-tab-button { margin: 0 2px !important; padding: 0 10px !important; + border-radius: 8px !important; } #TabsToolbar .toolbarbutton-1 image, @@ -263,3 +269,28 @@ tab > stack { height: 16px !important; width: 16px !important; } + +/* firefox-view-button */ +:root:not([privatebrowsingmode="temporary"]):not([firefoxviewhidden]) :is(#firefox-view-button, #wrapper-firefox-view-button) + #tabbrowser-tabs { + border-inline-start: none !important; + padding-inline-start: 0 !important; + margin-inline-start: 0 !important; +} + +#firefox-view-button { + border-radius: 8px !important; + background: var(--gnome-tabbar-tab-background) !important; +} + +#firefox-view-button:hover { + background: var(--gnome-tabbar-tab-hover-background) !important; +} + +#firefox-view-button:checked, #firefox-view-button:active { + background: var(--gnome-tabbar-tab-active-background) !important; +} + +#firefox-view-button > .toolbarbutton-icon { + filter: none !important; + box-shadow: none !important; +} diff --git a/src/other/firefox/Monterey/parts/tabsbar.css b/src/other/firefox/Monterey/parts/tabsbar.css index f789fa03..f0de066b 100644 --- a/src/other/firefox/Monterey/parts/tabsbar.css +++ b/src/other/firefox/Monterey/parts/tabsbar.css @@ -158,3 +158,21 @@ tab > stack { height: 16px !important; width: 16px !important; } + +/* firefox-view-button */ +:root:not([privatebrowsingmode="temporary"]):not([firefoxviewhidden]) :is(#firefox-view-button, #wrapper-firefox-view-button) + #tabbrowser-tabs { + border-inline-start: none !important; + padding-inline-start: 0 !important; + margin-inline-start: -40px !important; +} + +#firefox-view-button > .toolbarbutton-icon { + filter: none !important; + box-shadow: none !important; +} + +/* Remove shadow next to tab scroll buttons */ +.arrowscrollbox-overflow-start-indicator, +.arrowscrollbox-overflow-end-indicator { + display: none; +} diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css index b203de12..553beb84 100644 --- a/src/other/firefox/WhiteSur/parts/tabsbar.css +++ b/src/other/firefox/WhiteSur/parts/tabsbar.css @@ -13,8 +13,13 @@ /* Tabs bar height */ #tabbrowser-tabs, #tabbrowser-tabs arrowscrollbox { - height: initial !important; - min-height: initial !important; + height: 28px !important; + min-height: 28px !important; + --tab-min-height: 28px !important; +} + +.tab-background, .tab-stack { + min-height: 28px !important; } /* Extra margin for the first and last tabs */ @@ -65,7 +70,7 @@ /* Space between tabs */ .tabbrowser-tab:not([pinned=true]) { - margin: 0 0 !important; + margin: 0 !important; } /* Tab labels */ @@ -257,6 +262,13 @@ tab[selected]:-moz-window-inactive { transition: all 200ms; } +/* Tab hover */ +#TabsToolbar .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true]) { + background-color: var(--gnome-tabbar-tab-active-hover-background) !important; + border-image: none !important; + box-shadow: inset 0 1px var(--gnome-toolbar-border-color), inset 0 -1px var(--gnome-toolbar-border-color) !important; +} + /* Active tab */ .tab-background[selected=true] { background-color: var(--gnome-tabbar-tab-active-background) !important; @@ -276,13 +288,6 @@ tab[selected]:-moz-window-inactive { border-image: none !important; } -/* Tab hover */ -#TabsToolbar .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true]) { - background-color: var(--gnome-tabbar-tab-active-hover-background) !important; - border-image: none !important; - box-shadow: inset 0 1px var(--gnome-toolbar-border-color), inset 0 -1px var(--gnome-toolbar-border-color) !important; -} - /* Tabs scroll buttons hover */ #TabsToolbar .scrollbutton-up:not([disabled]):hover, #TabsToolbar .scrollbutton-down:not([disabled]):hover { background-color: var(--gnome-tabbar-tab-active-hover-background) !important; @@ -304,11 +309,28 @@ tab[selected]:-moz-window-inactive { display: none !important; } +/* TabsToolbar buttons */ #TabsToolbar .toolbarbutton-1 { margin: 0 !important; border-radius: 0 !important; } +/* firefox-view-button */ +:root:not([privatebrowsingmode="temporary"]):not([firefoxviewhidden]) :is(#firefox-view-button, #wrapper-firefox-view-button) + #tabbrowser-tabs { + border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important; + padding-inline-start: 0 !important; + margin-inline-start: 0 !important; +} + +#firefox-view-button { + border-radius: 0 !important; +} + +#firefox-view-button > .toolbarbutton-icon { + filter: none !important; + box-shadow: none !important; +} + /* Create new container tab indicator */ .tabbrowser-tab[class*="identity-color-"] .tab-content::before { content: "";