From 1d876a8ce7431e5dfdb7866709d285b72f8acb08 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Fri, 13 Jan 2023 15:13:44 +0800 Subject: [PATCH] Fixed #760 --- src/other/firefox/Monterey/colors/dark.css | 2 +- src/other/firefox/Monterey/colors/light.css | 2 +- src/other/firefox/Monterey/parts/buttons.css | 59 ++++++++++------ src/other/firefox/Monterey/parts/dialogs.css | 63 ++++++++++++----- src/other/firefox/Monterey/parts/findbar.css | 6 +- .../Monterey/parts/headerbar-urlbar-alt.css | 10 +-- .../Monterey/parts/headerbar-urlbar.css | 10 +-- .../firefox/Monterey/parts/headerbar.css | 33 ++++++--- src/other/firefox/Monterey/parts/icons.css | 41 +++++------ src/other/firefox/Monterey/parts/popups.css | 62 ++++++++++++---- .../firefox/Monterey/parts/toolbox-alt.css | 11 ++- src/other/firefox/Monterey/parts/toolbox.css | 18 ++--- src/other/firefox/WhiteSur/parts/buttons.css | 70 +++++++++++-------- src/other/firefox/WhiteSur/parts/dialogs.css | 63 ++++++++++++----- src/other/firefox/WhiteSur/parts/findbar.css | 6 +- .../firefox/WhiteSur/parts/headerbar.css | 47 ++++++++----- src/other/firefox/WhiteSur/parts/icons.css | 53 +++++++------- src/other/firefox/WhiteSur/parts/popups.css | 62 ++++++++++++---- src/other/firefox/WhiteSur/parts/tabsbar.css | 13 ++-- src/other/firefox/WhiteSur/parts/toolbox.css | 10 ++- 20 files changed, 411 insertions(+), 230 deletions(-) diff --git a/src/other/firefox/Monterey/colors/dark.css b/src/other/firefox/Monterey/colors/dark.css index c984b08..eecd725 100644 --- a/src/other/firefox/Monterey/colors/dark.css +++ b/src/other/firefox/Monterey/colors/dark.css @@ -14,7 +14,7 @@ /* Toolbars */ --gnome-toolbar-background: #373737; --gnome-tabstoolbar-background: #1e1e1e; - --gnome-findbar-background: #333333; + --gnome-findbar-background: #373737; --gnome-toolbar-color: #ffffff; --gnome-toolbar-border-color: #070707; --gnome-inactive-toolbar-background: #313131; diff --git a/src/other/firefox/Monterey/colors/light.css b/src/other/firefox/Monterey/colors/light.css index fb1028a..0b5b0ae 100644 --- a/src/other/firefox/Monterey/colors/light.css +++ b/src/other/firefox/Monterey/colors/light.css @@ -13,7 +13,7 @@ /* Toolbars */ --gnome-toolbar-background: #ffffff; --gnome-tabstoolbar-background: #E5E5E5; - --gnome-findbar-background: #f5f5f5; + --gnome-findbar-background: #ffffff; --gnome-toolbar-color: rgb(46, 52, 54); --gnome-toolbar-border-color: #cfcfcf; --gnome-inactive-toolbar-color: rgba(46, 52, 54, 0.35); diff --git a/src/other/firefox/Monterey/parts/buttons.css b/src/other/firefox/Monterey/parts/buttons.css index 4786393..47ef963 100644 --- a/src/other/firefox/Monterey/parts/buttons.css +++ b/src/other/firefox/Monterey/parts/buttons.css @@ -12,16 +12,14 @@ } /* Buttons */ -menulist, -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton),*/ +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button),*/ .subviewbutton.panel-subview-footer, .panel-footer button, #downloadsHistory, #downloadsPanel-mainView .download-state .downloadButton, -#overflowMenu-customize-button, #appMenu-popup .panel-banner-item, #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(#appMenu-fxa-label), -.subviewbutton-back, +.subviewbutton-back:not(#hack), #context-navigation menuitem, .identity-popup-preferences-button:not(#hack), .findbar-container toolbarbutton, @@ -32,7 +30,6 @@ button.close:not(.ghost-button), .menulist-label-box, .expander-down, .expander-up, .notification-button, -.protections-popup-footer-button, #identity-popup-security-expander, #protections-popup-info-button, #PanelUI-panic-view-button, @@ -41,7 +38,10 @@ button.close:not(.ghost-button), .autocomplete-richlistitem[type="loginsFooter"], .dialog-button-box button, .searchbar-engine-one-off-item, -.permission-popup-permission-remove-button { +.permission-popup-permission-remove-button, +.button.connect-device, +#item-choose button, +#editBMPanel_newFolderButton { -moz-appearance: none !important; background: var(--gnome-button-background) !important; box-shadow: var(--gnome-button-box-shadow) !important; @@ -57,20 +57,39 @@ button.close:not(.ghost-button), transition: all 200ms; } +menulist { + -moz-appearance: none !important; + background: var(--gnome-button-background) !important; + box-shadow: var(--gnome-button-box-shadow) !important; + border: 1px solid var(--gnome-button-border-color) !important; + border-bottom-color: var(--gnome-button-border-accent-color) !important; + border-radius: 8px !important; + color: var(--gnome-toolbar-color) !important; +} + /* Text buttons */ +menulist, .subviewbutton.panel-subview-footer, .panel-footer button, #downloadsHistory, #overflowMenu-customize-button, #appMenu-popup .panel-banner-item, #appMenu-zoomReset-button:not(#appMenu-fxa-label):not(#hack), +#appMenu-popup #appMenu-zoomReset-button2:not(#hack), #tracking-protection-preferences-button:not(#hack), .findbar-container toolbarbutton.findbar-button, .notification-button, .protections-popup-footer-button, #PanelUI-panic-view-button, .tracking-protection-button, -.dialog-button { +.dialog-button, +.autocomplete-richlistitem[type="loginsFooter"], +.dialog-button-box button, +.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]), +[overflowedItem="true"]) > #appMenu-fxa-label2:not(#hack), +.button.connect-device, +#item-choose button, +#editBMPanel_newFolderButton { padding: 2px 10px !important; text-align: center !important; } @@ -104,14 +123,14 @@ button.close:not(.ghost-button), /* Hover buttons */ menulist:hover, -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([open]):not([disabled]):not([checked]):hover,*/ +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([open]):not([disabled]):not([checked]):hover,*/ .subviewbutton.panel-subview-footer:hover, .panel-footer button:hover, #downloadsHistory:hover, #downloadsPanel-mainView .download-state .downloadButton:hover, #overflowMenu-customize-button:hover, #appMenu-popup .panel-banner-item:hover, -.subviewbutton-back:hover, +.subviewbutton-back:not(#hack):hover, #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(#appMenu-fxa-label):not([disabled]):hover, #context-navigation menuitem:not([disabled]):hover, .identity-popup-preferences-button:not(#hack):hover, @@ -139,9 +158,9 @@ menulist:hover .menulist-label-box, /* Active buttons */ menulist[open], -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled]):not(#hack):active,*/ -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not(.subviewbutton):not([disabled])[open],*/ -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled])[checked],*/ +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled]):not(#hack):active,*/ +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[open],*/ +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[checked],*/ .subviewbutton.panel-subview-footer:active, .panel-footer button:active, #downloadsHistory:active, @@ -176,7 +195,7 @@ menulist[open] .menulist-label-box, } /* Disabled buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled], +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled],*/ #appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled], #context-navigation menuitem[disabled] { background: var(--gnome-button-disabled-background) !important; @@ -197,7 +216,7 @@ menulist[open] .menulist-label-box, } /* Inactive window buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):-moz-window-inactive, +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):-moz-window-inactive,*/ .findbar-container toolbarbutton:-moz-window-inactive, #sidebar-switcher-target:-moz-window-inactive, #viewButton:-moz-window-inactive, @@ -217,6 +236,7 @@ button.close:not(.ghost-button), box-shadow: none !important; border-color: transparent !important; border-radius: 8px !important; + border: none !important; } .subviewbutton-back:not(#hack):not(:active):hover, @@ -258,8 +278,7 @@ button.close, } /* Combined buttons */ -#nav-bar .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#hack), -/*#nav-bar #back-button:not(#hack),*/ +#nav-bar .toolbaritem-combined-buttons:not(.unified-extensions-item) toolbarbutton:not(:last-of-type):not(#hack), #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#appMenu-zoomEnlarge-button), #context-navigation menuitem:not(:last-of-type), .findbar-container toolbarbutton.findbar-find-previous, @@ -270,8 +289,7 @@ button.close, margin-right: 0 !important; } -#nav-bar .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#hack), -/*#nav-bar #forward-button:not(#hack),*/ +#nav-bar .toolbaritem-combined-buttons:not(.unified-extensions-item) toolbarbutton:not(:first-of-type):not(#hack), #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#appMenu-fullscreen-button), #context-navigation menuitem:not(:first-of-type), .findbar-container toolbarbutton.findbar-find-previous, @@ -282,11 +300,6 @@ button.close, margin-left: 0 !important; } -#nav-bar .toolbaritem-combined-buttons { - margin-left: 0 !important; - margin-right: 0 !important; -} - /* Buttons with suggested action */ #appMenu-popup .panel-banner-item[notificationid="update-restart"], button.popup-notification-primary-button, diff --git a/src/other/firefox/Monterey/parts/dialogs.css b/src/other/firefox/Monterey/parts/dialogs.css index 24f872a..0807c40 100644 --- a/src/other/firefox/Monterey/parts/dialogs.css +++ b/src/other/firefox/Monterey/parts/dialogs.css @@ -2,58 +2,85 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; +window { + padding: 0 !important; +} + /* Browser dialog prompts center */ -.content-prompt { - display: flex !important; - align-items: center; - justify-content: center; +.dialogOverlay { + display: grid; + place-content: center; + justify-content: center; + grid-auto-rows: min(90%, var(--doc-height-px)); +} +.dialogOverlay[topmost="true"]:not(.dialogOverlay-window-modal-dialog-subdialog), #window-modal-dialog::backdrop { + background-color: rgba(0, 0, 0, .5) !important; +} + +#window-modal-dialog { + margin-top: auto !important; } /* Dialog */ .dialogBox { - border-radius: 9px !important; + border-radius: 12px !important; margin-top: 0 !important; } -#commonDialog { - background: var(--gnome-popover-background) !important; +window[role="dialog"] { + background: var(--gnome-toolbar-background) !important; border: 0 !important; - box-shadow: var(--gnome-popover-shadow) !important; + box-shadow: var(--gnome-menu-shadow) !important; padding: 0 !important; } - dialog { padding: 0 !important; } /* Content */ -.dialog-content-box { +.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; +} /* Buttons */ .dialog-button-box { display: flex !important; + border-top: 1px solid var(--gnome-menu-border-color) !important; + padding: 3px !important; } .dialog-button-box button:not(#hack) { height: auto !important; max-height: unset !important; padding: 10px 14px !important; - margin: 0 !important; - border-radius: 0 !important; + margin: 3px !important; + border-radius: 6px !important; flex: 1; - border-bottom: 0 !important; } /* Buttons borders - only suppor for cancel/ok */ -.dialog-button-box button[dlgtype="accept"] { - border-right: 0 !important; - border-left: 0 !important; +/*.dialog-button-box button[dlgtype="accept"] {*/ +/* border-right: 0 !important;*/ +/* border-left: 0 !important;*/ +/*}*/ +/*.dialog-button-box button[dlgtype="cancel"]:not(#hack) {*/ +/* border-left: 0 !important;*/ +/*}*/ + +/* Hadler dialog */ +#os-default-handler image { + display: none !important; } -.dialog-button-box button[dlgtype="cancel"]:not(#hack) { - border-left: 0 !important; +#os-default-handler .name { + font-weight: normal !important; } diff --git a/src/other/firefox/Monterey/parts/findbar.css b/src/other/firefox/Monterey/parts/findbar.css index 3c46da7..a70deba 100644 --- a/src/other/firefox/Monterey/parts/findbar.css +++ b/src/other/firefox/Monterey/parts/findbar.css @@ -3,16 +3,20 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; findbar { + padding: 0 !important; position: relative; } .findbar-container { + align-items: center; padding: 6px !important; display: flex; - justify-content: center; + justify-content: flex-start; position: relative; flex-direction: row; + margin: 0 !important; width: calc(100% - 42px); + height: auto !important; } hbox[anonid="findbar-textbox-wrapper"] { diff --git a/src/other/firefox/Monterey/parts/headerbar-urlbar-alt.css b/src/other/firefox/Monterey/parts/headerbar-urlbar-alt.css index c516aba..02d5878 100644 --- a/src/other/firefox/Monterey/parts/headerbar-urlbar-alt.css +++ b/src/other/firefox/Monterey/parts/headerbar-urlbar-alt.css @@ -156,13 +156,6 @@ toolbarspring { fill-opacity: 1 !important; } -.urlbar-icon { - width: 16px !important; - height: 16px !important; - padding: 0 1px !important; - margin: 0 !important; -} - #identity-box { margin: 3px 2px !important; border-radius: 5px !important; @@ -170,7 +163,10 @@ toolbarspring { .urlbar-page-action, #urlbar-go-button, .search-go-button, #tracking-protection-icon-container { + width: 28px !important; + height: 26px !important; margin: 3px 0 !important; + padding: 4px 6px !important; border-radius: 5px !important; } diff --git a/src/other/firefox/Monterey/parts/headerbar-urlbar.css b/src/other/firefox/Monterey/parts/headerbar-urlbar.css index a60f8a4..03d83e0 100644 --- a/src/other/firefox/Monterey/parts/headerbar-urlbar.css +++ b/src/other/firefox/Monterey/parts/headerbar-urlbar.css @@ -167,13 +167,6 @@ toolbarspring { fill-opacity: 1 !important; } -.urlbar-icon { - width: 16px !important; - height: 16px !important; - padding: 0 1px !important; - margin: 0 !important; -} - #identity-box { margin: 3px 2px !important; border-radius: 5px !important; @@ -181,7 +174,10 @@ toolbarspring { .urlbar-page-action, #urlbar-go-button, .search-go-button, #tracking-protection-icon-container { + width: 28px !important; + height: 26px !important; margin: 3px 0 !important; + padding: 4px 6px !important; border-radius: 5px !important; } diff --git a/src/other/firefox/Monterey/parts/headerbar.css b/src/other/firefox/Monterey/parts/headerbar.css index df0c771..a5b00c0 100644 --- a/src/other/firefox/Monterey/parts/headerbar.css +++ b/src/other/firefox/Monterey/parts/headerbar.css @@ -3,7 +3,7 @@ /* Headerbar */ #nav-bar { - padding: 8px 16px !important; + padding: 8px !important; } /* Headerbar CSD colors */ @@ -17,7 +17,8 @@ } /* Headerbar buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton) { +#nav-bar toolbarbutton:not(#urlbar-zoom-button), +toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 { border: none !important; box-shadow: none !important; background: none !important; @@ -26,18 +27,23 @@ margin: 8px 2px !important; padding: 0 10px !important; max-height: 32px !important; + min-height: 32px !important; min-width: 32px !important; color: var(--gnome-toolbar-color) !important; transition: background 200ms; --toolbarbutton-inner-padding: 0 !important; } -:root:-moz-window-inactive #nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton) { +:root:-moz-window-inactive #nav-bar toolbarbutton:not(#urlbar-zoom-button) { background: none !important; } +#nav-bar .toolbaritem-combined-buttons { + margin: 0 !important; +} + /* Hover headerbar buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([open]):not([disabled]):not([checked]):hover, +#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([open]):not([disabled]):not([checked]):hover, #TabsToolbar .toolbarbutton-1:hover, #tabs-newtab-button:hover, #TabsToolbar #new-tab-button:hover { outline: 0 !important; @@ -45,24 +51,31 @@ } /* Active headerbar buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled]):not(#hack):active, -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not(.subviewbutton):not([disabled])[open], -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled])[checked], +#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled]):not(#hack):active, +#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[open], +#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[checked], #TabsToolbar .toolbarbutton-1:active, #TabsToolbar .toolbarbutton-1[open], #tabs-newtab-button:active, #TabsToolbar #new-tab-button:active { background: var(--gnome-headerbar-button-active-background) !important; } /* Disabled headerbar buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton)[disabled] { +#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled] { + background: transparent !important; + border-color: var(--gnome-button-disabled-border-color) !important; + box-shadow: var(--gnome-button-disabled-box-shadow) !important; + opacity: 1 !important; } /* Inactive window buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):-moz-window-inactive { +#nav-bar toolbarbutton:not(#urlbar-zoom-button):-moz-window-inactive { + background: var(--gnome-inactive-button-background) !important; + box-shadow: var(--gnome-inactive-button-box-shadow) !important; + border-color: var(--gnome-inactive-button-border-color) !important; } /* Buttons with margins */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton) { +#nav-bar toolbarbutton:not(#urlbar-zoom-button) { margin: 0 2px !important; } diff --git a/src/other/firefox/Monterey/parts/icons.css b/src/other/firefox/Monterey/parts/icons.css index c5e5f25..e762a17 100644 --- a/src/other/firefox/Monterey/parts/icons.css +++ b/src/other/firefox/Monterey/parts/icons.css @@ -49,20 +49,6 @@ list-style-image: url("../icons/pan-start-symbolic.svg") !important; } -/* Sub menu arrow */ -.menu-right { - -moz-appearance: none !important; - list-style-image: url("../icons/pan-end-symbolic.svg") !important; - width: 16px !important; - height: 16px !important; -} -menu[disabled] > .menu-right { - opacity: 0.3; -} -menu:not([disabled]):hover > .menu-right { - filter: invert(100%) brightness(200%); -} - /* Arrow down buttons */ .expander-down > .button-box, #sidebar-switcher-arrow, @@ -126,9 +112,6 @@ treechildren::-moz-tree-twisty(selected, focus, open) { /* Menu checkbox */ menuitem[type="checkbox"] { list-style-image: url("../icons/checkbox-symbolic.svg") !important; -} -menuitem[type="checkbox"][hover="true"] { - } menuitem[type="checkbox"][checked="true"] { list-style-image: url("../icons/checkbox-checked-symbolic.svg") !important; @@ -136,9 +119,9 @@ menuitem[type="checkbox"][checked="true"] { menuitem[type="checkbox"][disabled="true"] .menu-iconic-icon { opacity: 0.5; } -menuitem[type="checkbox"]:not([disabled="true"]):hover .menu-iconic-icon { - filter: invert(100%) brightness(200%); -} +/*menuitem[type="checkbox"]:not([disabled="true"]):hover .menu-iconic-icon {*/ +/* filter: invert(100%) brightness(200%);*/ +/*}*/ /* Menu radio */ menuitem[type="radio"] { @@ -150,9 +133,23 @@ menuitem[type="radio"][checked="true"] { menuitem[type="radio"][disabled="true"] .menu-iconic-icon { opacity: 0.5; } -menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon { - filter: invert(100%) brightness(200%); +/*menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon {*/ +/* filter: invert(100%) brightness(200%);*/ +/*}*/ + +/* Sub menu arrow */ +.menu-right { + -moz-appearance: none !important; + list-style-image: url("../icons/pan-end-symbolic.svg") !important; + width: 16px !important; + height: 16px !important; } +menu[disabled] > .menu-right { + opacity: 0.3; +} +/*menu:not([disabled]):hover > .menu-right {*/ +/* filter: invert(100%) brightness(200%);*/ +/*}*/ /* Close button */ .close-icon:not(.tab-close-button), diff --git a/src/other/firefox/Monterey/parts/popups.css b/src/other/firefox/Monterey/parts/popups.css index 1e9bff9..8f64185 100644 --- a/src/other/firefox/Monterey/parts/popups.css +++ b/src/other/firefox/Monterey/parts/popups.css @@ -10,8 +10,8 @@ menupopup { --arrowpanel-border-radius: 12px !important; --arrowpanel-background: var(--gnome-menu-background) !important; --arrowpanel-border-color: var(--gnome-menu-border-color) !important; - --panel-border-radius: 8px !important; - --panel-padding: 8px 0 !important; + --panel-border-radius: 12px !important; + --panel-padding: 6px !important; -moz-appearance: none !important; color: var(--gnome-toolbar-color) !important; } @@ -23,7 +23,7 @@ menupopup label { #PlacesToolbar menupopup[placespopup="true"]::part(content), #PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), #PlacesToolbar menupopup { background: none !important; padding: 3px 4px 6px !important; - margin: 0 0 0 -12px !important; + margin: -3px 0 0 -12px !important; border: none !important; box-shadow: none !important; } @@ -34,8 +34,6 @@ menubar > menu > menupopup { } menuitem, menupopup menu { - -moz-appearance: none !important; - padding: 4px 8px !important; border: none !important; box-shadow: none !important; } @@ -55,7 +53,7 @@ panel { :is(menupopup, panel)[type="arrow"] { --panel-border-radius: 12px !important; - --panel-padding: 8px !important; + --panel-padding: 6px !important; } :is(panel, menupopup)::part(content) { @@ -80,7 +78,7 @@ panelview { } panelview { - padding: 8px !important; + padding: 6px !important; box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; border-radius: 12px !important; } @@ -136,20 +134,36 @@ panel:not([remote]), #BMB_bookmarksPopup { .proton-zap { border-image: unset !important; } -.panel-subview-body { +.panel-subview-body, +.panel-subview-body > .panel-subview-body { padding: 0 !important; } .panel-subview-footer { margin-top: 10px !important; } +/* Remove unwanted separators */ +.panel-header + toolbarseparator, +#identity-popup-mainView-panel-header + toolbarseparator, +#permission-popup-mainView-panel-header + toolbarseparator, +#protections-popup-mainView-panel-header-section + toolbarseparator { + display: none !important; +} + /* Style popovers menu buttons */ -.subviewbutton:not(.subviewbutton-back), -.toolbarbutton-1, .protections-popup-category, -.identity-popup-content-blocking-category { +menuitem, menupopup menu, +.subviewbutton:not(#appMenu-fxa-label2), +.toolbarbutton-1, +.protections-popup-footer-button, +.protections-popup-category, +.identity-popup-content-blocking-category, +#downloadsPanel-mainView .download-state { + -moz-appearance: none !important; border-radius: 6px !important; color: var(--gnome-toolbar-color) !important; font: menu !important; + padding: 0 6px !important; + min-height: 28px !important; } .subviewbutton:not(.subviewbutton-back), @@ -174,7 +188,6 @@ menuitem[disabled="true"], menupopup menu[disabled="true"], } /* Menu buttons hover */ -.toolbarbutton-1:not([disabled]):hover, menuitem:not([disabled="true"]):is(:hover, [_moz-menuactive]), menupopup menu:not([disabled="true"]):is(:hover, [_moz-menuactive]), .subviewbutton:not([disabled="true"], #appMenu-zoom-controls2, #appMenu-fxa-label2):hover, @@ -191,11 +204,30 @@ menupopup menu:not([disabled="true"]):is(:hover, [_moz-menuactive]), toolbarseparator, menuseparator { border-color: var(--gnome-popover-separator-color) !important; } -toolbarseparator:not([orient="vertical"]) { - margin: 8px 0 !important; +#PlacesToolbar menupopup[placespopup="true"] menuseparator { + border-top: 1px solid var(--gnome-popover-separator-color) !important; + padding: 0 !important; + margin: 4px 0 !important; +} +#PlacesToolbar menupopup[placespopup="true"] menuseparator::before { + border: 0 !important; +} +toolbarseparator:not([orient="vertical"]), menupopup menuseparator { + margin: 4px 0 !important; } toolbarseparator[orient="vertical"] { - margin: 0 3px !important; + margin: 0 4px !important; +} +.panel-subview-body + toolbarseparator:not([orient="vertical"]) { + margin: 0 0 4px !important; +} +panelview > toolbarseparator:not([orient="vertical"]), +#identity-popup-clear-sitedata-footer toolbarseparator:not([orient="vertical"]), +#identity-popup-more-info-footer toolbarseparator:not([orient="vertical"]){ + margin: 4px 6px !important; +} +#identity-popup-clear-sitedata-footer toolbarseparator:not([orient="vertical"]) { + margin-top: 0 !important; } /* Auto complete popups */ diff --git a/src/other/firefox/Monterey/parts/toolbox-alt.css b/src/other/firefox/Monterey/parts/toolbox-alt.css index 91b6f6b..85e6ac7 100644 --- a/src/other/firefox/Monterey/parts/toolbox-alt.css +++ b/src/other/firefox/Monterey/parts/toolbox-alt.css @@ -14,6 +14,10 @@ border-bottom: none !important; } +#TabsToolbar { + border-bottom: 1px solid var(--gnome-toolbar-border-color) !important; +} + findbar { border: 0 !important; background: var(--gnome-findbar-background) !important; @@ -78,14 +82,15 @@ findbar:-moz-window-inactive { } #PersonalToolbar { - padding: 0 4px !important; + padding: 0 3px 3px !important; height: 32px !important; + max-height: 32px !important; } /* bookmark-item */ toolbarbutton.bookmark-item { - padding: 0 4px; !important; + padding: 3px 6px !important; margin: 0 2px !important; border-radius: 3px !important; - max-height: 20px !important; + max-height: 24px !important; } diff --git a/src/other/firefox/Monterey/parts/toolbox.css b/src/other/firefox/Monterey/parts/toolbox.css index f71c624..c859610 100644 --- a/src/other/firefox/Monterey/parts/toolbox.css +++ b/src/other/firefox/Monterey/parts/toolbox.css @@ -8,14 +8,17 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; #nav-bar, #PersonalToolbar, #toolbar-menubar { - border: 0 !important; color: var(--gnome-toolbar-color); background: var(--gnome-toolbar-background) !important; - border-bottom: none !important; + border: none !important; +} + +#PersonalToolbar { + border-bottom: 1px solid var(--gnome-toolbar-border-color) !important; } findbar { - border: 0 !important; + border: none !important; background: var(--gnome-findbar-background) !important; border-bottom: 1px solid var(--gnome-toolbar-border-color) !important; } @@ -29,7 +32,7 @@ findbar:-moz-window-inactive { /* Toolbox colors */ #navigator-toolbox { - border: 0 !important; + border: none !important; background: none !important; } @@ -54,8 +57,6 @@ findbar:-moz-window-inactive { #nav-bar { border: none !important; box-shadow: none !important; - border-top-width: 0px !important; - border-bottom-width: 0px !important; } /* allow to drag headerbar empty space */ @@ -84,15 +85,14 @@ findbar:-moz-window-inactive { } #PersonalToolbar { - padding: 3px !important; + padding: 0 3px 3px !important; height: 32px !important; max-height: 32px !important; - padding-inline: 3px !important; } /* bookmark-item */ toolbarbutton.bookmark-item { - padding: 2px 6px !important; + padding: 3px 6px !important; margin: 0 2px !important; border-radius: 3px !important; max-height: 24px !important; diff --git a/src/other/firefox/WhiteSur/parts/buttons.css b/src/other/firefox/WhiteSur/parts/buttons.css index 78ca823..69bde3f 100644 --- a/src/other/firefox/WhiteSur/parts/buttons.css +++ b/src/other/firefox/WhiteSur/parts/buttons.css @@ -12,16 +12,14 @@ } /* Buttons */ -menulist, -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton),*/ +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button),*/ .subviewbutton.panel-subview-footer, .panel-footer button, #downloadsHistory, #downloadsPanel-mainView .download-state .downloadButton, -#overflowMenu-customize-button, #appMenu-popup .panel-banner-item, #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(#appMenu-fxa-label), -.subviewbutton-back, +.subviewbutton-back:not(#hack), #context-navigation menuitem, .identity-popup-preferences-button:not(#hack), .findbar-container toolbarbutton, @@ -32,7 +30,6 @@ button.close:not(.ghost-button), .menulist-label-box, .expander-down, .expander-up, .notification-button, -.protections-popup-footer-button, #identity-popup-security-expander, #protections-popup-info-button, #PanelUI-panic-view-button, @@ -41,7 +38,10 @@ button.close:not(.ghost-button), .autocomplete-richlistitem[type="loginsFooter"], .dialog-button-box button, .searchbar-engine-one-off-item, -.permission-popup-permission-remove-button { +.permission-popup-permission-remove-button, +.button.connect-device, +#item-choose button, +#editBMPanel_newFolderButton { -moz-appearance: none !important; background: var(--gnome-button-background) !important; box-shadow: var(--gnome-button-box-shadow) !important; @@ -57,20 +57,39 @@ button.close:not(.ghost-button), transition: all 200ms; } +menulist { + -moz-appearance: none !important; + background: var(--gnome-button-background) !important; + box-shadow: var(--gnome-button-box-shadow) !important; + border: 1px solid var(--gnome-button-border-color) !important; + border-bottom-color: var(--gnome-button-border-accent-color) !important; + border-radius: 8px !important; + color: var(--gnome-toolbar-color) !important; +} + /* Text buttons */ +menulist, .subviewbutton.panel-subview-footer, .panel-footer button, #downloadsHistory, #overflowMenu-customize-button, #appMenu-popup .panel-banner-item, #appMenu-zoomReset-button:not(#appMenu-fxa-label):not(#hack), +#appMenu-popup #appMenu-zoomReset-button2:not(#hack), #tracking-protection-preferences-button:not(#hack), .findbar-container toolbarbutton.findbar-button, .notification-button, .protections-popup-footer-button, #PanelUI-panic-view-button, .tracking-protection-button, -.dialog-button { +.dialog-button, +.autocomplete-richlistitem[type="loginsFooter"], +.dialog-button-box button, +.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]), +[overflowedItem="true"]) > #appMenu-fxa-label2:not(#hack), +.button.connect-device, +#item-choose button, +#editBMPanel_newFolderButton { padding: 2px 10px !important; text-align: center !important; } @@ -104,14 +123,14 @@ button.close:not(.ghost-button), /* Hover buttons */ menulist:hover, -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([open]):not([disabled]):not([checked]):hover,*/ +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([open]):not([disabled]):not([checked]):hover,*/ .subviewbutton.panel-subview-footer:hover, .panel-footer button:hover, #downloadsHistory:hover, #downloadsPanel-mainView .download-state .downloadButton:hover, #overflowMenu-customize-button:hover, #appMenu-popup .panel-banner-item:hover, -.subviewbutton-back:hover, +.subviewbutton-back:not(#hack):hover, #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(#appMenu-fxa-label):not([disabled]):hover, #context-navigation menuitem:not([disabled]):hover, .identity-popup-preferences-button:not(#hack):hover, @@ -139,9 +158,9 @@ menulist:hover .menulist-label-box, /* Active buttons */ menulist[open], -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled]):not(#hack):active,*/ -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not(.subviewbutton):not([disabled])[open],*/ -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled])[checked],*/ +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled]):not(#hack):active,*/ +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[open],*/ +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[checked],*/ .subviewbutton.panel-subview-footer:active, .panel-footer button:active, #downloadsHistory:active, @@ -176,7 +195,7 @@ menulist[open] .menulist-label-box, } /* Disabled buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled], +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled],*/ #appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled], #context-navigation menuitem[disabled] { background: var(--gnome-button-disabled-background) !important; @@ -197,7 +216,7 @@ menulist[open] .menulist-label-box, } /* Inactive window buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):-moz-window-inactive, +/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):-moz-window-inactive,*/ .findbar-container toolbarbutton:-moz-window-inactive, #sidebar-switcher-target:-moz-window-inactive, #viewButton:-moz-window-inactive, @@ -217,6 +236,7 @@ button.close:not(.ghost-button), box-shadow: none !important; border-color: transparent !important; border-radius: 8px !important; + border: none !important; } .subviewbutton-back:not(#hack):not(:active):hover, @@ -255,39 +275,33 @@ button.close, min-height: 32px !important; min-width: 32px !important; border-radius: 100% !important; - outline: none !important; } /* Combined buttons */ -#nav-bar .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#hack), -/*#nav-bar #back-button:not(#hack),*/ -#appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#appMenu-zoomEnlarge-button), +#nav-bar .toolbaritem-combined-buttons:not(.unified-extensions-item) toolbarbutton:not(:last-of-type):not(#hack), +#appMenu-popup .toolbaritem-combined-buttons:not(.unified-extensions-item) toolbarbutton:not(:last-of-type):not(#appMenu-zoomEnlarge-button), #context-navigation menuitem:not(:last-of-type), .findbar-container toolbarbutton.findbar-find-previous, -.findbar-button:not(:last-of-type) { +.findbar-button:not(:last-of-type), +.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; margin-right: 0 !important; } -#nav-bar .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#hack), -/*#nav-bar #forward-button:not(#hack),*/ -#appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#appMenu-fullscreen-button), +#nav-bar .toolbaritem-combined-buttons:not(.unified-extensions-item) toolbarbutton:not(:first-of-type):not(#hack), +#appMenu-popup .toolbaritem-combined-buttons:not(.unified-extensions-item) toolbarbutton:not(:first-of-type):not(#appMenu-fullscreen-button), #context-navigation menuitem:not(:first-of-type), .findbar-container toolbarbutton.findbar-find-previous, .findbar-container toolbarbutton.findbar-find-next, -.findbar-button:not(:first-of-type) { +.findbar-button:not(:first-of-type), +.search-panel-one-offs .searchbar-engine-one-off-item:not(:first-child) { border-top-left-radius: 0 !important; border-bottom-left-radius: 0 !important; margin-left: 0 !important; } -#nav-bar .toolbaritem-combined-buttons { - margin-left: 0 !important; - margin-right: 0 !important; -} - /* Buttons with suggested action */ #appMenu-popup .panel-banner-item[notificationid="update-restart"], button.popup-notification-primary-button, diff --git a/src/other/firefox/WhiteSur/parts/dialogs.css b/src/other/firefox/WhiteSur/parts/dialogs.css index 24f872a..0807c40 100644 --- a/src/other/firefox/WhiteSur/parts/dialogs.css +++ b/src/other/firefox/WhiteSur/parts/dialogs.css @@ -2,58 +2,85 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; +window { + padding: 0 !important; +} + /* Browser dialog prompts center */ -.content-prompt { - display: flex !important; - align-items: center; - justify-content: center; +.dialogOverlay { + display: grid; + place-content: center; + justify-content: center; + grid-auto-rows: min(90%, var(--doc-height-px)); +} +.dialogOverlay[topmost="true"]:not(.dialogOverlay-window-modal-dialog-subdialog), #window-modal-dialog::backdrop { + background-color: rgba(0, 0, 0, .5) !important; +} + +#window-modal-dialog { + margin-top: auto !important; } /* Dialog */ .dialogBox { - border-radius: 9px !important; + border-radius: 12px !important; margin-top: 0 !important; } -#commonDialog { - background: var(--gnome-popover-background) !important; +window[role="dialog"] { + background: var(--gnome-toolbar-background) !important; border: 0 !important; - box-shadow: var(--gnome-popover-shadow) !important; + box-shadow: var(--gnome-menu-shadow) !important; padding: 0 !important; } - dialog { padding: 0 !important; } /* Content */ -.dialog-content-box { +.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; +} /* Buttons */ .dialog-button-box { display: flex !important; + border-top: 1px solid var(--gnome-menu-border-color) !important; + padding: 3px !important; } .dialog-button-box button:not(#hack) { height: auto !important; max-height: unset !important; padding: 10px 14px !important; - margin: 0 !important; - border-radius: 0 !important; + margin: 3px !important; + border-radius: 6px !important; flex: 1; - border-bottom: 0 !important; } /* Buttons borders - only suppor for cancel/ok */ -.dialog-button-box button[dlgtype="accept"] { - border-right: 0 !important; - border-left: 0 !important; +/*.dialog-button-box button[dlgtype="accept"] {*/ +/* border-right: 0 !important;*/ +/* border-left: 0 !important;*/ +/*}*/ +/*.dialog-button-box button[dlgtype="cancel"]:not(#hack) {*/ +/* border-left: 0 !important;*/ +/*}*/ + +/* Hadler dialog */ +#os-default-handler image { + display: none !important; } -.dialog-button-box button[dlgtype="cancel"]:not(#hack) { - border-left: 0 !important; +#os-default-handler .name { + font-weight: normal !important; } diff --git a/src/other/firefox/WhiteSur/parts/findbar.css b/src/other/firefox/WhiteSur/parts/findbar.css index 3c46da7..a70deba 100644 --- a/src/other/firefox/WhiteSur/parts/findbar.css +++ b/src/other/firefox/WhiteSur/parts/findbar.css @@ -3,16 +3,20 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; findbar { + padding: 0 !important; position: relative; } .findbar-container { + align-items: center; padding: 6px !important; display: flex; - justify-content: center; + justify-content: flex-start; position: relative; flex-direction: row; + margin: 0 !important; width: calc(100% - 42px); + height: auto !important; } hbox[anonid="findbar-textbox-wrapper"] { diff --git a/src/other/firefox/WhiteSur/parts/headerbar.css b/src/other/firefox/WhiteSur/parts/headerbar.css index 0b7dc53..09f7257 100644 --- a/src/other/firefox/WhiteSur/parts/headerbar.css +++ b/src/other/firefox/WhiteSur/parts/headerbar.css @@ -5,64 +5,79 @@ /* Headerbar */ #nav-bar { - padding: 8px 16px !important; + padding: 8px !important; } /* Headerbar CSD colors */ :root[tabsintitlebar] #nav-bar { - background: var(--gnome-headerbar-background) !important; border: none !important; border-bottom: none !important; box-shadow: var(--gnome-headerbar-box-shadow) !important; } :root[tabsintitlebar] #nav-bar:-moz-window-inactive { - background: var(--gnome-inactive-headerbar-background) !important; box-shadow: var(--gnome-inactive-headerbar-box-shadow) !important; } /* Headerbar buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton) { +#nav-bar toolbarbutton:not(#urlbar-zoom-button), +toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 { border: none !important; box-shadow: none !important; background: none !important; -moz-appearance: none !important; border-radius: 8px !important; - margin: 10px 2px !important; + margin: 8px 2px !important; padding: 0 10px !important; - max-height: 30px !important; + max-height: 32px !important; + min-height: 32px !important; min-width: 32px !important; color: var(--gnome-toolbar-color) !important; transition: background 200ms; --toolbarbutton-inner-padding: 0 !important; } -:root:-moz-window-inactive #nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton) { +:root:-moz-window-inactive #nav-bar toolbarbutton:not(#urlbar-zoom-button) { background: none !important; } +#nav-bar .toolbaritem-combined-buttons { + margin: 0 !important; +} + /* Hover headerbar buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([open]):not([disabled]):not([checked]):hover { +#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([open]):not([disabled]):not([checked]):hover, +#TabsToolbar .toolbarbutton-1:hover, +#tabs-newtab-button:hover, #TabsToolbar #new-tab-button:hover { outline: 0 !important; background: var(--gnome-headerbar-button-hover-background) !important; } /* Active headerbar buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled]):not(#hack):active, -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not(.subviewbutton):not([disabled])[open], -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled])[checked] { +#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled]):not(#hack):active, +#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[open], +#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[checked], +#TabsToolbar .toolbarbutton-1:active, #TabsToolbar .toolbarbutton-1[open], +#tabs-newtab-button:active, #TabsToolbar #new-tab-button:active { background: var(--gnome-headerbar-button-active-background) !important; } /* Disabled headerbar buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton)[disabled] { +#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled] { + background: transparent !important; + border-color: var(--gnome-button-disabled-border-color) !important; + box-shadow: var(--gnome-button-disabled-box-shadow) !important; + opacity: 1 !important; } /* Inactive window buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):-moz-window-inactive { +#nav-bar toolbarbutton:not(#urlbar-zoom-button):-moz-window-inactive { + background: var(--gnome-inactive-button-background) !important; + box-shadow: var(--gnome-inactive-button-box-shadow) !important; + border-color: var(--gnome-inactive-button-border-color) !important; } /* Buttons with margins */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton) { +#nav-bar toolbarbutton:not(#urlbar-zoom-button) { margin: 0 2px !important; } @@ -90,7 +105,7 @@ box-shadow: none !important; border-radius: 8px !important; color: var(--gnome-urlbar-color) !important; - padding: 0 6px !important; + padding: 0 3px !important; height: 32px !important; max-height: 32px !important; transition: box-shadow 200ms; @@ -111,7 +126,7 @@ #urlbar[breakout][breakout-extend] #urlbar-input-container:hover { background: none !important; box-shadow: none !important; - padding: 0 6px !important; + padding: 0 3px !important; } #nav-bar #searchbar:focus-within { diff --git a/src/other/firefox/WhiteSur/parts/icons.css b/src/other/firefox/WhiteSur/parts/icons.css index dcce40d..e762a17 100644 --- a/src/other/firefox/WhiteSur/parts/icons.css +++ b/src/other/firefox/WhiteSur/parts/icons.css @@ -4,9 +4,9 @@ /* Cursors autoscroller fix */ .autoscroller { - --panel-background: transparent !important; - --panel-border-color: transparent !important; - background-image: url("chrome://global/skin/icons/autoscroll.svg") !important; + --panel-background: transparent !important; + --panel-border-color: transparent !important; + background-image: url("chrome://global/skin/icons/autoscroll.svg") !important; } /* Built-in firefox icons color */ @@ -35,13 +35,13 @@ margin-top: -2px !important; } .protections-popup-category::after { - content: url("../icons/pan-start-symbolic.svg") !important; + content: url("../icons/pan-end-symbolic.svg") !important; } .identity-popup-content-blocking-category::after { - content: url("../icons/pan-start-symbolic.svg") !important; + content: url("../icons/pan-end-symbolic.svg") !important; } #identity-popup-security-expander .button-icon { - list-style-image: url("../icons/pan-start-symbolic.svg") !important; + list-style-image: url("../icons/pan-end-symbolic.svg") !important; } /* Popovers subview back button */ @@ -49,20 +49,6 @@ list-style-image: url("../icons/pan-start-symbolic.svg") !important; } -/* Sub menu arrow */ -.menu-right { - -moz-appearance: none !important; - list-style-image: url("../icons/pan-end-symbolic.svg") !important; - width: 16px !important; - height: 16px !important; -} -menu[disabled] > .menu-right { - opacity: 0.3; -} -menu:not([disabled]):hover > .menu-right { - filter: invert(100%) brightness(200%); -} - /* Arrow down buttons */ .expander-down > .button-box, #sidebar-switcher-arrow, @@ -126,9 +112,6 @@ treechildren::-moz-tree-twisty(selected, focus, open) { /* Menu checkbox */ menuitem[type="checkbox"] { list-style-image: url("../icons/checkbox-symbolic.svg") !important; -} -menuitem[type="checkbox"][hover="true"] { - } menuitem[type="checkbox"][checked="true"] { list-style-image: url("../icons/checkbox-checked-symbolic.svg") !important; @@ -136,9 +119,9 @@ menuitem[type="checkbox"][checked="true"] { menuitem[type="checkbox"][disabled="true"] .menu-iconic-icon { opacity: 0.5; } -menuitem[type="checkbox"]:not([disabled="true"]):hover .menu-iconic-icon { - filter: invert(100%) brightness(200%); -} +/*menuitem[type="checkbox"]:not([disabled="true"]):hover .menu-iconic-icon {*/ +/* filter: invert(100%) brightness(200%);*/ +/*}*/ /* Menu radio */ menuitem[type="radio"] { @@ -150,9 +133,23 @@ menuitem[type="radio"][checked="true"] { menuitem[type="radio"][disabled="true"] .menu-iconic-icon { opacity: 0.5; } -menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon { - filter: invert(100%) brightness(200%); +/*menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon {*/ +/* filter: invert(100%) brightness(200%);*/ +/*}*/ + +/* Sub menu arrow */ +.menu-right { + -moz-appearance: none !important; + list-style-image: url("../icons/pan-end-symbolic.svg") !important; + width: 16px !important; + height: 16px !important; } +menu[disabled] > .menu-right { + opacity: 0.3; +} +/*menu:not([disabled]):hover > .menu-right {*/ +/* filter: invert(100%) brightness(200%);*/ +/*}*/ /* Close button */ .close-icon:not(.tab-close-button), diff --git a/src/other/firefox/WhiteSur/parts/popups.css b/src/other/firefox/WhiteSur/parts/popups.css index 1e9bff9..8f64185 100644 --- a/src/other/firefox/WhiteSur/parts/popups.css +++ b/src/other/firefox/WhiteSur/parts/popups.css @@ -10,8 +10,8 @@ menupopup { --arrowpanel-border-radius: 12px !important; --arrowpanel-background: var(--gnome-menu-background) !important; --arrowpanel-border-color: var(--gnome-menu-border-color) !important; - --panel-border-radius: 8px !important; - --panel-padding: 8px 0 !important; + --panel-border-radius: 12px !important; + --panel-padding: 6px !important; -moz-appearance: none !important; color: var(--gnome-toolbar-color) !important; } @@ -23,7 +23,7 @@ menupopup label { #PlacesToolbar menupopup[placespopup="true"]::part(content), #PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), #PlacesToolbar menupopup { background: none !important; padding: 3px 4px 6px !important; - margin: 0 0 0 -12px !important; + margin: -3px 0 0 -12px !important; border: none !important; box-shadow: none !important; } @@ -34,8 +34,6 @@ menubar > menu > menupopup { } menuitem, menupopup menu { - -moz-appearance: none !important; - padding: 4px 8px !important; border: none !important; box-shadow: none !important; } @@ -55,7 +53,7 @@ panel { :is(menupopup, panel)[type="arrow"] { --panel-border-radius: 12px !important; - --panel-padding: 8px !important; + --panel-padding: 6px !important; } :is(panel, menupopup)::part(content) { @@ -80,7 +78,7 @@ panelview { } panelview { - padding: 8px !important; + padding: 6px !important; box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; border-radius: 12px !important; } @@ -136,20 +134,36 @@ panel:not([remote]), #BMB_bookmarksPopup { .proton-zap { border-image: unset !important; } -.panel-subview-body { +.panel-subview-body, +.panel-subview-body > .panel-subview-body { padding: 0 !important; } .panel-subview-footer { margin-top: 10px !important; } +/* Remove unwanted separators */ +.panel-header + toolbarseparator, +#identity-popup-mainView-panel-header + toolbarseparator, +#permission-popup-mainView-panel-header + toolbarseparator, +#protections-popup-mainView-panel-header-section + toolbarseparator { + display: none !important; +} + /* Style popovers menu buttons */ -.subviewbutton:not(.subviewbutton-back), -.toolbarbutton-1, .protections-popup-category, -.identity-popup-content-blocking-category { +menuitem, menupopup menu, +.subviewbutton:not(#appMenu-fxa-label2), +.toolbarbutton-1, +.protections-popup-footer-button, +.protections-popup-category, +.identity-popup-content-blocking-category, +#downloadsPanel-mainView .download-state { + -moz-appearance: none !important; border-radius: 6px !important; color: var(--gnome-toolbar-color) !important; font: menu !important; + padding: 0 6px !important; + min-height: 28px !important; } .subviewbutton:not(.subviewbutton-back), @@ -174,7 +188,6 @@ menuitem[disabled="true"], menupopup menu[disabled="true"], } /* Menu buttons hover */ -.toolbarbutton-1:not([disabled]):hover, menuitem:not([disabled="true"]):is(:hover, [_moz-menuactive]), menupopup menu:not([disabled="true"]):is(:hover, [_moz-menuactive]), .subviewbutton:not([disabled="true"], #appMenu-zoom-controls2, #appMenu-fxa-label2):hover, @@ -191,11 +204,30 @@ menupopup menu:not([disabled="true"]):is(:hover, [_moz-menuactive]), toolbarseparator, menuseparator { border-color: var(--gnome-popover-separator-color) !important; } -toolbarseparator:not([orient="vertical"]) { - margin: 8px 0 !important; +#PlacesToolbar menupopup[placespopup="true"] menuseparator { + border-top: 1px solid var(--gnome-popover-separator-color) !important; + padding: 0 !important; + margin: 4px 0 !important; +} +#PlacesToolbar menupopup[placespopup="true"] menuseparator::before { + border: 0 !important; +} +toolbarseparator:not([orient="vertical"]), menupopup menuseparator { + margin: 4px 0 !important; } toolbarseparator[orient="vertical"] { - margin: 0 3px !important; + margin: 0 4px !important; +} +.panel-subview-body + toolbarseparator:not([orient="vertical"]) { + margin: 0 0 4px !important; +} +panelview > toolbarseparator:not([orient="vertical"]), +#identity-popup-clear-sitedata-footer toolbarseparator:not([orient="vertical"]), +#identity-popup-more-info-footer toolbarseparator:not([orient="vertical"]){ + margin: 4px 6px !important; +} +#identity-popup-clear-sitedata-footer toolbarseparator:not([orient="vertical"]) { + margin-top: 0 !important; } /* Auto complete popups */ diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css index 553beb8..ca7ae89 100644 --- a/src/other/firefox/WhiteSur/parts/tabsbar.css +++ b/src/other/firefox/WhiteSur/parts/tabsbar.css @@ -13,13 +13,13 @@ /* Tabs bar height */ #tabbrowser-tabs, #tabbrowser-tabs arrowscrollbox { - height: 28px !important; - min-height: 28px !important; - --tab-min-height: 28px !important; + height: 32px !important; + min-height: 32px !important; + --tab-min-height: 32px !important; } .tab-background, .tab-stack { - min-height: 28px !important; + min-height: 32px !important; } /* Extra margin for the first and last tabs */ @@ -99,7 +99,7 @@ tab[selected]:-moz-window-inactive { align-items: center; margin-top: -1px; min-width: 100% !important; - padding: 0 10px !important; + padding: 0 8px !important; } /* Prevent tab icons size breaking */ @@ -313,6 +313,9 @@ tab[selected]:-moz-window-inactive { #TabsToolbar .toolbarbutton-1 { margin: 0 !important; border-radius: 0 !important; + min-width: 32px !important; + height: 32px !important; + padding: 0 !important; } /* firefox-view-button */ diff --git a/src/other/firefox/WhiteSur/parts/toolbox.css b/src/other/firefox/WhiteSur/parts/toolbox.css index c501315..e443a0e 100644 --- a/src/other/firefox/WhiteSur/parts/toolbox.css +++ b/src/other/firefox/WhiteSur/parts/toolbox.css @@ -96,10 +96,16 @@ findbar:-moz-window-inactive label, margin-top: 0 !important; } +#PersonalToolbar { + padding: 0 3px 3px !important; + height: 32px !important; + max-height: 32px !important; +} + /* bookmark-item */ toolbarbutton.bookmark-item { - padding: 0 4px; !important; + padding: 3px 6px !important; margin: 0 2px !important; border-radius: 3px !important; - max-height: 20px !important; + max-height: 24px !important; }