diff --git a/src/other/firefox/Monterey/parts/buttons-fixes.css b/src/other/firefox/Monterey/parts/buttons-fixes.css index d4d4ae7..a9abde5 100644 --- a/src/other/firefox/Monterey/parts/buttons-fixes.css +++ b/src/other/firefox/Monterey/parts/buttons-fixes.css @@ -227,6 +227,5 @@ button.close.ghost-button:active { /* Close button */ .close-icon:not(.tab-close-button) .toolbarbutton-icon { - outline: 0 !important; + outline: 0 !important; } - diff --git a/src/other/firefox/Monterey/parts/buttons.css b/src/other/firefox/Monterey/parts/buttons.css index 47ef963..2782c56 100644 --- a/src/other/firefox/Monterey/parts/buttons.css +++ b/src/other/firefox/Monterey/parts/buttons.css @@ -41,7 +41,8 @@ button.close:not(.ghost-button), .permission-popup-permission-remove-button, .button.connect-device, #item-choose button, -#editBMPanel_newFolderButton { +#editBMPanel_newFolderButton, +button.customizationmode-button { -moz-appearance: none !important; background: var(--gnome-button-background) !important; box-shadow: var(--gnome-button-box-shadow) !important; @@ -89,7 +90,8 @@ menulist, [overflowedItem="true"]) > #appMenu-fxa-label2:not(#hack), .button.connect-device, #item-choose button, -#editBMPanel_newFolderButton { +#editBMPanel_newFolderButton, +button.customizationmode-button { padding: 2px 10px !important; text-align: center !important; } @@ -151,7 +153,8 @@ menulist:hover .menulist-label-box, .autocomplete-richlistitem[type="loginsFooter"]:hover, .dialog-button-box button:hover, .searchbar-engine-one-off-item:hover, -.permission-popup-permission-remove-button:hover { +.permission-popup-permission-remove-button:hover, +button.customizationmode-button:hover { outline: 0 !important; background: var(--gnome-button-hover-background) !important; } @@ -188,7 +191,8 @@ menulist[open] .menulist-label-box, .dialog-button:active, .autocomplete-richlistitem[type="loginsFooter"]:active, .dialog-button-box button:active, -.permission-popup-permission-remove-button:active { +.permission-popup-permission-remove-button:active, +button.customizationmode-button:active { background: var(--gnome-button-active-background) !important; box-shadow: var(--gnome-button-active-box-shadow) !important; border-color: var(--gnome-button-active-border-color) !important; @@ -197,7 +201,8 @@ menulist[open] .menulist-label-box, /* Disabled buttons */ /*#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled],*/ #appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled], -#context-navigation menuitem[disabled] { +#context-navigation menuitem[disabled], +button.customizationmode-button[disabled] { background: var(--gnome-button-disabled-background) !important; border-color: var(--gnome-button-disabled-border-color) !important; box-shadow: var(--gnome-button-disabled-box-shadow) !important; diff --git a/src/other/firefox/Monterey/parts/dialogs.css b/src/other/firefox/Monterey/parts/dialogs.css index 8be436f..7727728 100644 --- a/src/other/firefox/Monterey/parts/dialogs.css +++ b/src/other/firefox/Monterey/parts/dialogs.css @@ -24,30 +24,38 @@ window { /* Dialog */ .dialogBox { border-radius: 12px !important; - margin-top: 0 !important; + margin: 0 !important; } window[role="dialog"] { background: var(--gnome-toolbar-background) !important; border: 0 !important; - box-shadow: var(--gnome-menu-shadow) !important; padding: 0 !important; } + dialog { padding: 0 !important; } +dialog[subdialog] { + border-radius: 12px !important; + border: 1px solid var(--gnome-popover-border-color) !important; + box-shadow: var(--gnome-popover-shadow) !important; +} + /* Content */ .dialog-content-box, #dialogGrid { padding: 24px; padding-bottom: 0; } + #titleContainer { padding: 6px !important; margin-top: 6px !important; justify-content: center !important; } + .titleIcon { background-color: transparent !important; } diff --git a/src/other/firefox/Monterey/parts/headerbar-urlbar.css b/src/other/firefox/Monterey/parts/headerbar-urlbar.css index 5d2872a..0eb00c5 100644 --- a/src/other/firefox/Monterey/parts/headerbar-urlbar.css +++ b/src/other/firefox/Monterey/parts/headerbar-urlbar.css @@ -84,6 +84,7 @@ toolbarspring { #urlbar-input { text-align: center !important; + padding: 0 28px 0 0 !important; } /* URL bar results */ diff --git a/src/other/firefox/Monterey/parts/popups.css b/src/other/firefox/Monterey/parts/popups.css index 31b97c6..044a347 100644 --- a/src/other/firefox/Monterey/parts/popups.css +++ b/src/other/firefox/Monterey/parts/popups.css @@ -4,7 +4,9 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; /* Style menus */ -menupopup { +menupopup, panel, +:is(menupopup, panel)[type="arrow"] { + -moz-appearance: none !important; --panel-background: var(--gnome-menu-background) !important; --panel-border-color: var(--gnome-menu-border-color) !important; --arrowpanel-border-radius: 12px !important; @@ -12,8 +14,8 @@ menupopup { --arrowpanel-border-color: var(--gnome-menu-border-color) !important; --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; + --panel-shadow: var(--gnome-popover-shadow) !important; + --panel-shadow-margin: 3px 8px 13px !important; color: var(--gnome-toolbar-color) !important; } @@ -21,7 +23,9 @@ menupopup label { color: var(--gnome-toolbar-color) !important; } -#PlacesToolbar menupopup[placespopup="true"]::part(content), #PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), #PlacesToolbar menupopup { +#PlacesToolbar menupopup[placespopup="true"]::part(content), +#PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), +#PlacesToolbar menupopup { background: none !important; padding: 3px 4px 6px !important; margin: -3px 0 0 -12px !important; @@ -46,16 +50,6 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover { background: 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: 6px !important; -} - :is(panel, menupopup)::part(content) { border: none !important; } @@ -78,16 +72,19 @@ panelview { } panelview { - padding: 6px !important; - box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; - border-radius: 12px !important; + padding: var(--panel-padding) !important; } -.panel-arrowcontent { - background: var(--gnome-popover-background) !important; - border: 1px solid var(--gnome-popover-border-color) !important; +#customization-panelWrapper > .panel-arrowcontent { + border: 1px solid var(--gnome-menu-border-color) !important; + box-shadow: var(--gnome-popover-shadow) !important; border-radius: 12px !important; - color: var(--gnome-toolbar-color) !important; + background: var(--gnome-menu-background) !important; +} + +#customization-panelWrapper > .panel-arrowbox > .panel-arrow[side="top"] { + fill: var(--gnome-menu-background) !important; + stroke: var(--gnome-menu-border-color) !important; } #BMB_bookmarksPopup { diff --git a/src/other/firefox/WhiteSur/parts/buttons-fixes.css b/src/other/firefox/WhiteSur/parts/buttons-fixes.css index d4d4ae7..a9abde5 100644 --- a/src/other/firefox/WhiteSur/parts/buttons-fixes.css +++ b/src/other/firefox/WhiteSur/parts/buttons-fixes.css @@ -227,6 +227,5 @@ button.close.ghost-button:active { /* Close button */ .close-icon:not(.tab-close-button) .toolbarbutton-icon { - outline: 0 !important; + outline: 0 !important; } - diff --git a/src/other/firefox/WhiteSur/parts/buttons.css b/src/other/firefox/WhiteSur/parts/buttons.css index 69bde3f..e83c4a9 100644 --- a/src/other/firefox/WhiteSur/parts/buttons.css +++ b/src/other/firefox/WhiteSur/parts/buttons.css @@ -41,7 +41,8 @@ button.close:not(.ghost-button), .permission-popup-permission-remove-button, .button.connect-device, #item-choose button, -#editBMPanel_newFolderButton { +#editBMPanel_newFolderButton, +button.customizationmode-button { -moz-appearance: none !important; background: var(--gnome-button-background) !important; box-shadow: var(--gnome-button-box-shadow) !important; @@ -89,7 +90,8 @@ menulist, [overflowedItem="true"]) > #appMenu-fxa-label2:not(#hack), .button.connect-device, #item-choose button, -#editBMPanel_newFolderButton { +#editBMPanel_newFolderButton, +button.customizationmode-button { padding: 2px 10px !important; text-align: center !important; } @@ -151,7 +153,8 @@ menulist:hover .menulist-label-box, .autocomplete-richlistitem[type="loginsFooter"]:hover, .dialog-button-box button:hover, .searchbar-engine-one-off-item:hover, -.permission-popup-permission-remove-button:hover { +.permission-popup-permission-remove-button:hover, +button.customizationmode-button:hover { outline: 0 !important; background: var(--gnome-button-hover-background) !important; } @@ -188,7 +191,8 @@ menulist[open] .menulist-label-box, .dialog-button:active, .autocomplete-richlistitem[type="loginsFooter"]:active, .dialog-button-box button:active, -.permission-popup-permission-remove-button:active { +.permission-popup-permission-remove-button:active, +button.customizationmode-button:active { background: var(--gnome-button-active-background) !important; box-shadow: var(--gnome-button-active-box-shadow) !important; border-color: var(--gnome-button-active-border-color) !important; @@ -197,7 +201,8 @@ menulist[open] .menulist-label-box, /* Disabled buttons */ /*#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled],*/ #appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled], -#context-navigation menuitem[disabled] { +#context-navigation menuitem[disabled], +button.customizationmode-button[disabled] { background: var(--gnome-button-disabled-background) !important; border-color: var(--gnome-button-disabled-border-color) !important; box-shadow: var(--gnome-button-disabled-box-shadow) !important; @@ -286,7 +291,7 @@ button.close, .search-panel-one-offs .searchbar-engine-one-off-item:not(:last-child) { border-top-right-radius: 0 !important; border-bottom-right-radius: 0 !important; - border-right-width: 0 !important; + border-right-width: 1px !important; margin-right: 0 !important; } @@ -299,6 +304,7 @@ button.close, .search-panel-one-offs .searchbar-engine-one-off-item:not(:first-child) { border-top-left-radius: 0 !important; border-bottom-left-radius: 0 !important; + border-left-width: 0 !important; margin-left: 0 !important; } @@ -339,7 +345,7 @@ button.popup-notification-primary-button.popup-notification-button:active, border-color: var(--gnome-button-destructive-action-border-color) !important; border-bottom-color: var(--gnome-button-destructive-action-border-accent-color) !important; box-shadow: var(--gnome-button-destructive-action-box-shadow) !important; - text-shadow: 0 -1px rgba(0, 0, 0, 0.558275) !important; + text-shadow: 0 -1px rgba(0, 0, 0, 0.5) !important; } #editBookmarkPanelRemoveButton:hover, diff --git a/src/other/firefox/WhiteSur/parts/dialogs.css b/src/other/firefox/WhiteSur/parts/dialogs.css index 8be436f..7727728 100644 --- a/src/other/firefox/WhiteSur/parts/dialogs.css +++ b/src/other/firefox/WhiteSur/parts/dialogs.css @@ -24,30 +24,38 @@ window { /* Dialog */ .dialogBox { border-radius: 12px !important; - margin-top: 0 !important; + margin: 0 !important; } window[role="dialog"] { background: var(--gnome-toolbar-background) !important; border: 0 !important; - box-shadow: var(--gnome-menu-shadow) !important; padding: 0 !important; } + dialog { padding: 0 !important; } +dialog[subdialog] { + border-radius: 12px !important; + border: 1px solid var(--gnome-popover-border-color) !important; + box-shadow: var(--gnome-popover-shadow) !important; +} + /* Content */ .dialog-content-box, #dialogGrid { padding: 24px; padding-bottom: 0; } + #titleContainer { padding: 6px !important; margin-top: 6px !important; justify-content: center !important; } + .titleIcon { background-color: transparent !important; } diff --git a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css index 35f02c0..fda1fb0 100644 --- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css +++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css @@ -62,6 +62,7 @@ toolbarspring { #urlbar-input { text-align: center !important; + padding: 0 28px 0 0 !important; } /* URL bar results */ diff --git a/src/other/firefox/WhiteSur/parts/popups.css b/src/other/firefox/WhiteSur/parts/popups.css index 31b97c6..044a347 100644 --- a/src/other/firefox/WhiteSur/parts/popups.css +++ b/src/other/firefox/WhiteSur/parts/popups.css @@ -4,7 +4,9 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; /* Style menus */ -menupopup { +menupopup, panel, +:is(menupopup, panel)[type="arrow"] { + -moz-appearance: none !important; --panel-background: var(--gnome-menu-background) !important; --panel-border-color: var(--gnome-menu-border-color) !important; --arrowpanel-border-radius: 12px !important; @@ -12,8 +14,8 @@ menupopup { --arrowpanel-border-color: var(--gnome-menu-border-color) !important; --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; + --panel-shadow: var(--gnome-popover-shadow) !important; + --panel-shadow-margin: 3px 8px 13px !important; color: var(--gnome-toolbar-color) !important; } @@ -21,7 +23,9 @@ menupopup label { color: var(--gnome-toolbar-color) !important; } -#PlacesToolbar menupopup[placespopup="true"]::part(content), #PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), #PlacesToolbar menupopup { +#PlacesToolbar menupopup[placespopup="true"]::part(content), +#PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), +#PlacesToolbar menupopup { background: none !important; padding: 3px 4px 6px !important; margin: -3px 0 0 -12px !important; @@ -46,16 +50,6 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover { background: 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: 6px !important; -} - :is(panel, menupopup)::part(content) { border: none !important; } @@ -78,16 +72,19 @@ panelview { } panelview { - padding: 6px !important; - box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; - border-radius: 12px !important; + padding: var(--panel-padding) !important; } -.panel-arrowcontent { - background: var(--gnome-popover-background) !important; - border: 1px solid var(--gnome-popover-border-color) !important; +#customization-panelWrapper > .panel-arrowcontent { + border: 1px solid var(--gnome-menu-border-color) !important; + box-shadow: var(--gnome-popover-shadow) !important; border-radius: 12px !important; - color: var(--gnome-toolbar-color) !important; + background: var(--gnome-menu-background) !important; +} + +#customization-panelWrapper > .panel-arrowbox > .panel-arrow[side="top"] { + fill: var(--gnome-menu-background) !important; + stroke: var(--gnome-menu-border-color) !important; } #BMB_bookmarksPopup {