From fe20127688bce4beb7ae4c7a9cd0400e82ee3589 Mon Sep 17 00:00:00 2001 From: Vince Date: Tue, 3 Aug 2021 14:24:26 +0800 Subject: [PATCH] update --- src/other/firefox/Monterey/parts/popups.css | 62 ++++++------- src/other/firefox/WhiteSur/parts/popups.css | 97 +++++++++++---------- 2 files changed, 82 insertions(+), 77 deletions(-) diff --git a/src/other/firefox/Monterey/parts/popups.css b/src/other/firefox/Monterey/parts/popups.css index ce03ab98..4e1ee203 100644 --- a/src/other/firefox/Monterey/parts/popups.css +++ b/src/other/firefox/Monterey/parts/popups.css @@ -3,24 +3,6 @@ @import "popups-contents.css"; @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; -menupopup { - --panel-background: transparent !important; - --panel-border-color: transparent !important; -} - -panel { - --panel-background: var(--gnome-menu-background) !important; - --panel-border-color: var(--gnome-menu-border-color) !important; -} - -:is(panel, menupopup)::part(content) { - border: none !important; -} - -panelview { - padding: 12px !important; -} - /* Style menus */ menupopup { -moz-appearance: none !important; @@ -29,10 +11,7 @@ menupopup { border-radius: 8px !important; padding: 6px 0 !important; color: var(--gnome-toolbar-color) !important; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; -} -menupopup menupopup { - margin: -5px 0 0 -4px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; } menubar > menu > menupopup { @@ -55,8 +34,30 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover { background: transparent !important; } +menupopup { + --panel-background: transparent !important; + --panel-border-color: transparent !important; +} + +panel { + --panel-background: var(--gnome-menu-background) !important; + --panel-border-color: var(--gnome-menu-border-color) !important; +} + +:is(menupopup, panel)[type="arrow"] { + --panel-border-radius: 12px !important; + --panel-padding: 8px !important; +} + +:is(panel, menupopup)::part(content) { + border: none !important; +} + /* Adjust popovers position */ -panel[type=arrow] { +panel[type="arrow"] { + appearance: none !important; + border: none !important; + background-color: transparent !important; margin-top: 8px !important; } @@ -69,18 +70,19 @@ panelview { background: transparent !important; } +panelview { + padding: 8px !important; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; + border-radius: 12px !important; +} + .panel-arrowcontent { background: var(--gnome-popover-background) !important; border: 1px solid var(--gnome-popover-border-color) !important; - border-radius: 8px!important; - padding: 0 !important; + border-radius: 12px !important; color: var(--gnome-toolbar-color) !important; } -.panel-arrow { - fill: var(--gnome-popover-background) !important; - stroke: var(--gnome-popover-border-color) !important; - display: -moz-inline-box !important; -} + panel:not([remote]), #BMB_bookmarksPopup { --arrowpanel-background: var(--gnome-popover-background) !important; } diff --git a/src/other/firefox/WhiteSur/parts/popups.css b/src/other/firefox/WhiteSur/parts/popups.css index 6fc144c6..4e1ee203 100644 --- a/src/other/firefox/WhiteSur/parts/popups.css +++ b/src/other/firefox/WhiteSur/parts/popups.css @@ -3,6 +3,37 @@ @import "popups-contents.css"; @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; +/* Style menus */ +menupopup { + -moz-appearance: none !important; + background: var(--gnome-menu-background) !important; + border: 1px solid var(--gnome-menu-border-color) !important; + border-radius: 8px !important; + padding: 6px 0 !important; + color: var(--gnome-toolbar-color) !important; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; +} + +menubar > menu > menupopup { + border-top-left-radius: 0 !important; + border-top-right-radius: 0 !important; +} + +menuitem, menupopup menu { + -moz-appearance: none !important; + padding: 4px 8px !important; + border: none !important; + box-shadow: none !important; +} + +menuitem[type="checkbox"] image, menuitem[type="radio"] image { + visibility: visible !important; +} + +menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover { + background: transparent !important; +} + menupopup { --panel-background: transparent !important; --panel-border-color: transparent !important; @@ -13,48 +44,20 @@ panel { --panel-border-color: var(--gnome-menu-border-color) !important; } +:is(menupopup, panel)[type="arrow"] { + --panel-border-radius: 12px !important; + --panel-padding: 8px !important; +} + :is(panel, menupopup)::part(content) { border: none !important; } -panelview { - padding: 12px !important; -} - -/* Style menus */ -menupopup { - -moz-appearance: none !important; - background: var(--gnome-menu-background) !important; - border: 1px solid var(--gnome-menu-border-color) !important; - border-radius: 8px !important; - padding: 6px 0 !important; - color: var(--gnome-toolbar-color) !important; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; -} -menupopup menupopup { - margin: -5px 0 0 -4px; -} - -menubar > menu > menupopup { - border-top-left-radius: 0 !important; - border-top-right-radius: 0 !important; -} - -menuitem, menupopup menu { - -moz-appearance: none !important; - padding: 4px 8px !important; -} - -menuitem[type="checkbox"] image, menuitem[type="radio"] image { - visibility: visible !important; -} - -menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover { - background: transparent !important; -} - /* Adjust popovers position */ -panel[type=arrow] { +panel[type="arrow"] { + appearance: none !important; + border: none !important; + background-color: transparent !important; margin-top: 8px !important; } @@ -63,23 +66,23 @@ panel[type=arrow] { .panel-header, .PanelUI-subView, .panel-subview-body, #widget-overflow-mainView, #protections-popup-footer, panelview { - border: 0 !important; + border: none !important; background: transparent !important; } +panelview { + padding: 8px !important; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; + border-radius: 12px !important; +} + .panel-arrowcontent { background: var(--gnome-popover-background) !important; - border: 1px solid !important; - border-color: var(--gnome-popover-border-color) !important; - border-radius: 8px!important; - padding: 0 !important; + border: 1px solid var(--gnome-popover-border-color) !important; + border-radius: 12px !important; color: var(--gnome-toolbar-color) !important; } -.panel-arrow { - fill: var(--gnome-popover-background) !important; - stroke: var(--gnome-popover-border-color) !important; - display: -moz-inline-box !important; -} + panel:not([remote]), #BMB_bookmarksPopup { --arrowpanel-background: var(--gnome-popover-background) !important; }