From a643d3520f0a4af4841a3ee7abfb2c8b4289a284 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sun, 12 Feb 2023 02:47:05 +0800 Subject: [PATCH] Fixed firefox theme issues --- .../firefox/Monterey/left_header_button_3.css | 4 +-- .../firefox/Monterey/left_header_button_4.css | 4 +-- .../firefox/Monterey/left_header_button_5.css | 4 +-- .../firefox/Monterey/parts/headerbar.css | 2 +- src/other/firefox/Monterey/parts/popups.css | 2 +- src/other/firefox/Monterey/parts/tabsbar.css | 14 ++++------ .../Monterey/right_header_button_3.css | 4 +-- .../Monterey/right_header_button_4.css | 4 +-- .../Monterey/right_header_button_5.css | 4 +-- src/other/firefox/WhiteSur/parts/popups.css | 28 ++++++++++++------- 10 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/other/firefox/Monterey/left_header_button_3.css b/src/other/firefox/Monterey/left_header_button_3.css index 3329df8..cb14607 100644 --- a/src/other/firefox/Monterey/left_header_button_3.css +++ b/src/other/firefox/Monterey/left_header_button_3.css @@ -1,9 +1,9 @@ #TabsToolbar { - margin-left: 460px !important; + margin-left: 451px !important; } :root[sizemode="maximized"] #TabsToolbar { - margin-left: 500px !important; + margin-left: 491px !important; } /* Left window titlebuttons mode */ diff --git a/src/other/firefox/Monterey/left_header_button_4.css b/src/other/firefox/Monterey/left_header_button_4.css index c27f894..4c74f32 100644 --- a/src/other/firefox/Monterey/left_header_button_4.css +++ b/src/other/firefox/Monterey/left_header_button_4.css @@ -1,9 +1,9 @@ #TabsToolbar { - margin-left: 500px !important; + margin-left: 491px !important; } :root[sizemode="maximized"] #TabsToolbar { - margin-left: 540px !important; + margin-left: 531px !important; } /* Left window titlebuttons mode */ diff --git a/src/other/firefox/Monterey/left_header_button_5.css b/src/other/firefox/Monterey/left_header_button_5.css index 5679ec0..a342364 100644 --- a/src/other/firefox/Monterey/left_header_button_5.css +++ b/src/other/firefox/Monterey/left_header_button_5.css @@ -1,9 +1,9 @@ #TabsToolbar { - margin-left: 540px !important; + margin-left: 531px !important; } :root[sizemode="maximized"] #TabsToolbar { - margin-left: 580px !important; + margin-left: 571px !important; } /* Left window titlebuttons mode */ diff --git a/src/other/firefox/Monterey/parts/headerbar.css b/src/other/firefox/Monterey/parts/headerbar.css index a5b00c0..e79cc9e 100644 --- a/src/other/firefox/Monterey/parts/headerbar.css +++ b/src/other/firefox/Monterey/parts/headerbar.css @@ -13,7 +13,7 @@ box-shadow: var(--gnome-headerbar-box-shadow) !important; } :root[tabsintitlebar] #nav-bar:-moz-window-inactive { - box-shadow: var(--gnome-inactive-headerbar-box-shadow) !important; + box-shadow: var(--gnome-inactive-headerbar-box-shadow); } /* Headerbar buttons */ diff --git a/src/other/firefox/Monterey/parts/popups.css b/src/other/firefox/Monterey/parts/popups.css index 4a0004c..31b97c6 100644 --- a/src/other/firefox/Monterey/parts/popups.css +++ b/src/other/firefox/Monterey/parts/popups.css @@ -13,6 +13,7 @@ menupopup { --panel-border-radius: 12px !important; --panel-padding: 6px !important; -moz-appearance: none !important; + --panel-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; color: var(--gnome-toolbar-color) !important; } @@ -25,7 +26,6 @@ menupopup label { padding: 3px 4px 6px !important; margin: -3px 0 0 -12px !important; border: none !important; - box-shadow: none !important; } menubar > menu > menupopup { diff --git a/src/other/firefox/Monterey/parts/tabsbar.css b/src/other/firefox/Monterey/parts/tabsbar.css index f0de066..6d21314 100644 --- a/src/other/firefox/Monterey/parts/tabsbar.css +++ b/src/other/firefox/Monterey/parts/tabsbar.css @@ -18,13 +18,8 @@ tab > stack { background-image: none !important; } -.tabbrowser-tab:not([pinned]) { - margin: 2px 0 0 !important; -} - -.tabbrowser-tab[pinned] { - margin-top: 2px !important; - margin-bottom: 0 !important; +.tabbrowser-tab { + margin: 1px 0 0 0 !important; } .tabbrowser-tab:not([visuallyselected="true"], [multiselected]), .tabbrowser-tab:-moz-lwtheme { @@ -127,16 +122,17 @@ tab > stack { } #TabsToolbar #alltabs-button { - padding: 0 0 !important; + padding: 0 !important; visibility: collapse !important; } #TabsToolbar .toolbarbutton-1, #tabs-newtab-button, #TabsToolbar #new-tab-button { - margin: 2px 2px 0 !important; + margin: 1px 2px 0 !important; padding: 0 10px !important; max-height: 32px !important; min-height: 32px !important; + border-radius: 8px !important; } #TabsToolbar .toolbarbutton-1 image, diff --git a/src/other/firefox/Monterey/right_header_button_3.css b/src/other/firefox/Monterey/right_header_button_3.css index f31df62..00a1ee4 100644 --- a/src/other/firefox/Monterey/right_header_button_3.css +++ b/src/other/firefox/Monterey/right_header_button_3.css @@ -1,10 +1,10 @@ #TabsToolbar { - margin-right: 12vw !important; + margin-right: 14vw !important; } /* Left window titlebuttons mode */ @media (-moz-gtk-csd-reversed-placement) { #TabsToolbar { - margin-right: 8vw !important; + margin-right: 10vw !important; } } diff --git a/src/other/firefox/Monterey/right_header_button_4.css b/src/other/firefox/Monterey/right_header_button_4.css index 00a1ee4..b1f9964 100644 --- a/src/other/firefox/Monterey/right_header_button_4.css +++ b/src/other/firefox/Monterey/right_header_button_4.css @@ -1,10 +1,10 @@ #TabsToolbar { - margin-right: 14vw !important; + margin-right: 16vw !important; } /* Left window titlebuttons mode */ @media (-moz-gtk-csd-reversed-placement) { #TabsToolbar { - margin-right: 10vw !important; + margin-right: 12vw !important; } } diff --git a/src/other/firefox/Monterey/right_header_button_5.css b/src/other/firefox/Monterey/right_header_button_5.css index b1f9964..9ce2f6d 100644 --- a/src/other/firefox/Monterey/right_header_button_5.css +++ b/src/other/firefox/Monterey/right_header_button_5.css @@ -1,10 +1,10 @@ #TabsToolbar { - margin-right: 16vw !important; + margin-right: 18vw !important; } /* Left window titlebuttons mode */ @media (-moz-gtk-csd-reversed-placement) { #TabsToolbar { - margin-right: 12vw !important; + margin-right: 14vw !important; } } diff --git a/src/other/firefox/WhiteSur/parts/popups.css b/src/other/firefox/WhiteSur/parts/popups.css index dc98ba3..31b97c6 100644 --- a/src/other/firefox/WhiteSur/parts/popups.css +++ b/src/other/firefox/WhiteSur/parts/popups.css @@ -13,6 +13,7 @@ menupopup { --panel-border-radius: 12px !important; --panel-padding: 6px !important; -moz-appearance: none !important; + --panel-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; color: var(--gnome-toolbar-color) !important; } @@ -25,7 +26,6 @@ menupopup label { padding: 3px 4px 6px !important; margin: -3px 0 0 -12px !important; border: none !important; - box-shadow: none !important; } menubar > menu > menupopup { @@ -101,10 +101,6 @@ panelview { padding: 6px !important; } -toolbarbutton menupopup[placespopup] > :is(menu, menuitem) { - margin: 0 !important; -} - panel:not([remote]), #BMB_bookmarksPopup { --arrowpanel-background: var(--gnome-popover-background) !important; } @@ -170,13 +166,26 @@ menuitem, menupopup menu, min-height: 28px !important; } -.subviewbutton:not(.subviewbutton-back), +.subviewbutton, +.protections-popup-footer-button, .protections-popup-category, -.identity-popup-content-blocking-category { +.identity-popup-content-blocking-category, +#PlacesToolbar menupopup[placespopup="true"] .bookmark-item, +.openintabs-menuitem, +.widget-overflow-list .toolbarbutton-1 { padding: 5px !important; margin: 0 !important; } +.subviewbutton[shortcut]:after { + opacity: 0.5 !important; +} + +.bookmark-item .menu-right { + fill-opacity: 1 !important; +} + + /* Menu buttons disabled */ menuitem[disabled="true"], menupopup menu[disabled="true"], .subviewbutton[disabled="true"], .toolbarbutton-1[disabled="true"], @@ -184,11 +193,10 @@ menuitem[disabled="true"], menupopup menu[disabled="true"], .identity-popup-content-blocking-category[disabled="true"] { opacity: 0.5 !important; /* color: var(--gnome-inactive-toolbar-color) !important;*/ - background: none !important; } -.subviewbutton[shortcut]:after { - opacity: 0.5 !important; +menuitem[disabled="true"][_moz-menuactive], menupopup menu[disabled="true"][_moz-menuactive] { + background: none !important; } /* Menu buttons hover */