From 2b7737d4c6110e73f9a3d34a4ab2c289150cd392 Mon Sep 17 00:00:00 2001 From: Vince Date: Wed, 9 Jun 2021 10:33:42 +0800 Subject: [PATCH] Fixed firefox theme issues #294 --- .../firefox/WhiteSur/parts/buttons-fixes.css | 4 +- src/other/firefox/WhiteSur/parts/buttons.css | 11 +- src/other/firefox/WhiteSur/parts/icons.css | 5 +- src/other/firefox/WhiteSur/system-icons.css | 346 ++++++++++-------- 4 files changed, 202 insertions(+), 164 deletions(-) diff --git a/src/other/firefox/WhiteSur/parts/buttons-fixes.css b/src/other/firefox/WhiteSur/parts/buttons-fixes.css index 36211fc..2441724 100644 --- a/src/other/firefox/WhiteSur/parts/buttons-fixes.css +++ b/src/other/firefox/WhiteSur/parts/buttons-fixes.css @@ -205,10 +205,10 @@ button.close { display: none !important; } .protections-popup-footer-button-label { - margin-inline-start: 0 !important; + margin-inline-start: 0 !important; } #protections-popup-footer-protection-type-label { - margin-inline-end: 0 !important; + margin-inline-end: 0 !important; margin-block: 0 !important; } diff --git a/src/other/firefox/WhiteSur/parts/buttons.css b/src/other/firefox/WhiteSur/parts/buttons.css index f8bae09..0404e6d 100644 --- a/src/other/firefox/WhiteSur/parts/buttons.css +++ b/src/other/firefox/WhiteSur/parts/buttons.css @@ -229,11 +229,20 @@ button.close:not(:active):hover, #TabsToolbar .toolbarbutton-1:not(:active):not([open]):hover, #protections-popup-info-button:hover, .permission-popup-permission-remove-button:not(:active):hover { - box-shadow: var(--gnome-button-box-shadow) !important; + box-shadow: none !important; border-color: var(--gnome-button-border-color) !important; border-bottom-color: var(--gnome-button-border-accent-color) !important; } +.subviewbutton-back:not(#hack):active, +.close-icon:not(.tab-close-button):active, +button.close:active, +#TabsToolbar .toolbarbutton-1:active, +#protections-popup-info-button:active, +.permission-popup-permission-remove-button:active { + box-shadow: none !important; +} + .close-icon:not(.tab-close-button) { background: transparent !important; box-shadow: none !important; diff --git a/src/other/firefox/WhiteSur/parts/icons.css b/src/other/firefox/WhiteSur/parts/icons.css index c71e83b..06fbd76 100644 --- a/src/other/firefox/WhiteSur/parts/icons.css +++ b/src/other/firefox/WhiteSur/parts/icons.css @@ -498,8 +498,9 @@ menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon { #reload-button .toolbarbutton-icon, #stop-button .toolbarbutton-icon, #downloads-button .toolbarbutton-icon, - #nav-bar #sync-button .toolbarbutton-icon, - #nav-bar #new-window-button .toolbarbutton-icon, + #sync-button .toolbarbutton-icon, + #new-window-button .toolbarbutton-icon, + #screenshot-button .toolbarbutton-icon, #tracking-protection-icon, #identity-icon, #pageActionButton, diff --git a/src/other/firefox/WhiteSur/system-icons.css b/src/other/firefox/WhiteSur/system-icons.css index 928f924..3f22995 100644 --- a/src/other/firefox/WhiteSur/system-icons.css +++ b/src/other/firefox/WhiteSur/system-icons.css @@ -12,164 +12,192 @@ } } -/* Toolbars close button */ -.close-icon:not(.tab-close-button) { - list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important; -} -.close-icon:not(.tab-close-button) image { - filter: var(--gnome-window-icons-hack-filter) !important; -} - -/* Navbar icons */ - -/* Back button */ -#nav-bar #back-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/go-previous-symbolic?size=dialog") !important; -} -/* Forward button */ -#nav-bar #forward-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/go-next-symbolic?size=dialog") !important; -} -/* Menu button */ -#PanelUI-menu-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/open-menu-symbolic?size=dialog") !important; -} -/* New tab button */ -#new-tab-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/tab-new-symbolic?size=dialog") !important; -} -/* Home button */ -#home-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/user-home-symbolic?size=dialog") !important; -} -/* Preferences button */ -#preferences-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/preferences-system-symbolic?size=dialog") !important; -} -/* Fullscreen button */ -#fullscreen-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/view-fullscreen-symbolic?size=dialog") !important; -} -/* Zoom out button */ -#zoom-out-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/zoom-out-symbolic?size=dialog") !important; -} -/* Zoom in button */ -#zoom-in-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/zoom-in-symbolic?size=dialog") !important; -} -/* Developer button */ -#developer-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/applications-engineering-symbolic?size=dialog") !important; -} -/* Email link button */ -#email-link-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/mail-unread-symbolic?size=dialog") !important; -} -/* Print button */ -#print-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/printer-symbolic?size=dialog") !important; -} -/* Addons button */ -#add-ons-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/application-x-addon-symbolic?size=dialog") !important; -} -/* Find button */ -#find-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/edit-find-symbolic?size=dialog") !important; -} -/* New window button */ -#new-window-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/window-new-symbolic?size=dialog") !important; -} -/* Bookmarks menu button */ -#bookmarks-menu-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/starred-symbolic?size=dialog") !important; -} -/* History button */ -#history-panelmenu .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/preferences-system-time-symbolic?size=dialog") !important; -} -/* All tabs button */ -#alltabs-button { - list-style-image: url("moz-icon://stock/pan-down-symbolic?size=dialog") !important; -} -#alltabs-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); -} -/* Cut button */ -#cut-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/edit-cut-symbolic?size=dialog") !important; -} -/* Copy button */ -#copy-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/edit-copy-symbolic?size=dialog") !important; -} -/* Paste button */ -#paste-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/edit-paste-symbolic?size=dialog") !important; -} - -/* Navbar overflow button */ -#nav-bar-overflow-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/view-more-horizontal-symbolic?size=dialog") !important; -} - -/* Context back button */ -#context-back .menu-iconic-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/go-previous-symbolic?size=dialog") !important; -} -/* Context forward button */ -#context-forward .menu-iconic-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/go-next-symbolic?size=dialog") !important; -} - -/* Main menu buttons icons */ -#appMenu-zoomReduce-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/zoom-out-symbolic?size=dialog") !important; -} -#appMenu-zoomEnlarge-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/zoom-in-symbolic?size=dialog") !important; -} -#appMenu-fullscreen-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/view-fullscreen-symbolic?size=dialog") !important; -} -#appMenu-cut-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/edit-cut-symbolic?size=dialog") !important; -} -#appMenu-copy-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/edit-copy-symbolic?size=dialog") !important; -} -#appMenu-paste-button .toolbarbutton-icon { - filter: var(--gnome-icons-hack-filter); - list-style-image: url("moz-icon://stock/edit-paste-symbolic?size=dialog") !important; +/* OPTIONAL: Use system theme icons instead of Adwaita icons included by theme */ +@supports -moz-bool-pref("gnomeTheme.systemIcons") { + /* Window buttons */ + :root[tabsintitlebar] #titlebar .titlebar-button .toolbarbutton-icon, + :root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton .toolbarbutton-icon { + filter: var(--gnome-window-icons-hack-filter) !important; + width: 16px; + } + :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon, + :root[tabsintitlebar] #titlebar #titlebar-close .toolbarbutton-icon { + list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important; + } + :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-max .toolbarbutton-icon, + :root[tabsintitlebar] #titlebar #titlebar-max .toolbarbutton-icon { + list-style-image: url("moz-icon://stock/window-maximize-symbolic?size=dialog") !important; + } + :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-restore .toolbarbutton-icon { + list-style-image: url("moz-icon://stock/window-restore-symbolic?size=dialog") !important; + } + :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min .toolbarbutton-icon, + :root[tabsintitlebar] #titlebar #titlebar-min .toolbarbutton-icon { + list-style-image: url("moz-icon://stock/window-minimize-symbolic?size=dialog") !important; + } + :root[tabsintitlebar][inFullscreen] #window-controls #restore-button .toolbarbutton-icon { + list-style-image: url("moz-icon://stock/view-restore-symbolic?size=dialog") !important; + } + + /* Toolbars close button */ + .close-icon:not(.tab-close-button) { + list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important; + } + .close-icon:not(.tab-close-button) image { + filter: var(--gnome-window-icons-hack-filter) !important; + } + + /* Navbar icons */ + + /* Back button */ + #nav-bar #back-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/go-previous-symbolic?size=dialog") !important; + } + /* Forward button */ + #nav-bar #forward-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/go-next-symbolic?size=dialog") !important; + } + /* Menu button */ + #PanelUI-menu-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/open-menu-symbolic?size=dialog") !important; + } + /* New tab button */ + #new-tab-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/tab-new-symbolic?size=dialog") !important; + } + /* Home button */ + #home-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/user-home-symbolic?size=dialog") !important; + } + /* Preferences button */ + #preferences-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/preferences-system-symbolic?size=dialog") !important; + } + /* Fullscreen button */ + #fullscreen-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/view-fullscreen-symbolic?size=dialog") !important; + } + /* Zoom out button */ + #zoom-out-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/zoom-out-symbolic?size=dialog") !important; + } + /* Zoom in button */ + #zoom-in-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/zoom-in-symbolic?size=dialog") !important; + } + /* Developer button */ + #developer-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/applications-engineering-symbolic?size=dialog") !important; + } + /* Email link button */ + #email-link-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/mail-unread-symbolic?size=dialog") !important; + } + /* Print button */ + #print-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/printer-symbolic?size=dialog") !important; + } + /* Addons button */ + #add-ons-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/application-x-addon-symbolic?size=dialog") !important; + } + /* Find button */ + #find-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/edit-find-symbolic?size=dialog") !important; + } + /* New window button */ + #new-window-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/window-new-symbolic?size=dialog") !important; + } + /* Bookmarks menu button */ + #bookmarks-menu-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/starred-symbolic?size=dialog") !important; + } + /* History button */ + #history-panelmenu .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/preferences-system-time-symbolic?size=dialog") !important; + } + /* All tabs button */ + #alltabs-button { + list-style-image: url("moz-icon://stock/pan-down-symbolic?size=dialog") !important; + } + #alltabs-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + } + /* Cut button */ + #cut-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/edit-cut-symbolic?size=dialog") !important; + } + /* Copy button */ + #copy-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/edit-copy-symbolic?size=dialog") !important; + } + /* Paste button */ + #paste-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/edit-paste-symbolic?size=dialog") !important; + } + + /* Navbar overflow button */ + #nav-bar-overflow-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/pan-down-symbolic?size=dialog") !important; + } + + /* Context back button */ + #context-back .menu-iconic-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/go-previous-symbolic?size=dialog") !important; + } + /* Context forward button */ + #context-forward .menu-iconic-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/go-next-symbolic?size=dialog") !important; + } + + /* Main menu buttons icons */ + #appMenu-zoomReduce-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/zoom-out-symbolic?size=dialog") !important; + } + #appMenu-zoomEnlarge-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/zoom-in-symbolic?size=dialog") !important; + } + #appMenu-fullscreen-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/view-fullscreen-symbolic?size=dialog") !important; + } + #appMenu-cut-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/edit-cut-symbolic?size=dialog") !important; + } + #appMenu-copy-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/edit-copy-symbolic?size=dialog") !important; + } + #appMenu-paste-button .toolbarbutton-icon { + filter: var(--gnome-icons-hack-filter); + list-style-image: url("moz-icon://stock/edit-paste-symbolic?size=dialog") !important; + } }