diff --git a/src/firefox/chrome/Orchis/colors/keep-dark.css b/src/firefox/chrome/Orchis/colors/keep-dark.css index ff0b58c..39d7b97 100644 --- a/src/firefox/chrome/Orchis/colors/keep-dark.css +++ b/src/firefox/chrome/Orchis/colors/keep-dark.css @@ -52,6 +52,7 @@ --gnome-button-active-border-color: transparent; --gnome-button-active-border-accent-color: transparent; --gnome-button-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.03); + --gnome-button-disabled-color: rgba(255, 255, 255, 0.25); --gnome-button-disabled-background: rgba(255, 255, 255, 0.06); --gnome-button-disabled-border-color: transparent; --gnome-button-disabled-box-shadow: inset 0 1px rgba(255, 255, 255, 0.03); diff --git a/src/firefox/chrome/Orchis/parts/icons-dark.css b/src/firefox/chrome/Orchis/parts/icons-dark.css new file mode 100644 index 0000000..3856b9e --- /dev/null +++ b/src/firefox/chrome/Orchis/parts/icons-dark.css @@ -0,0 +1,396 @@ +/* Replace icons */ + +@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; + +/* Built-in firefox icons color */ +.protections-popup-category-icon, +.protections-popup-footer-icon { + fill: var(--gnome-button-color) !important; + fill-opacity: 1 !important; +} + +/* Tabs scroll icons */ +#TabsToolbar .scrollbutton-up { + list-style-image: url("../icons/pan-start-symbolic.svg") !important; +} +#TabsToolbar .scrollbutton-down { + list-style-image: url("../icons/pan-start-symbolic.svg") !important; +} + +/* Popovers subview menu arrow */ +.PanelUI-subView .subviewbutton-nav::after { + content: "" !important; + background: url("../icons/pan-start-symbolic.svg"); + background-size: contain; + height: 16px; + width: 16px; + margin-top: -2px !important; +} +.protections-popup-category::after { + content: url("../icons/pan-start-symbolic.svg") !important; +} +.identity-popup-content-blocking-category::after { + content: url("../icons/pan-start-symbolic.svg") !important; +} +#identity-popup-security-expander .button-icon { + list-style-image: url("../icons/pan-start-symbolic.svg") !important; +} + +/* Popovers subview back button */ +.subviewbutton-back { + 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, +#viewButton .button-menu-dropmarker { + -moz-appearance: none !important; + list-style-image: url("../icons/pan-down-symbolic.svg") !important; + width: 16px !important; + height: 16px !important; +} +.menulist-label-box:after { + content: url("../icons/pan-down-symbolic.svg") !important; +} + +/* Arrow up buttons */ +.expander-up > .button-box { + -moz-appearance: none !important; + list-style-image: url("../icons/pan-up-symbolic.svg") !important; + width: 16px !important; + height: 16px !important; +} + +/* Search entries */ +#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon, +.searchbar-search-icon, +#search-box .textbox-search-sign { + list-style-image: url(../icons/edit-find-symbolic.svg) !important; + opacity: 0.7 !important; +} +#search-box .textbox-search-sign { + width: 16px !important; + margin: 2px 0; +} + +/* Tree views */ +treechildren::-moz-tree-twisty { + list-style-image: url("../icons/pan-down-symbolic.svg") !important; + width: 16px !important; + height: 16px !important; +} +treechildren::-moz-tree-twisty(open) { + list-style-image: url("../icons/pan-end-symbolic.svg") !important; +} +treechildren::-moz-tree-twisty(selected, focus) { + list-style-image: url("../icons/pan-down-symbolic-dark.svg") !important; +} +treechildren::-moz-tree-twisty(selected, focus, open) { + list-style-image: url("../icons/pan-end-symbolic-dark.svg") !important; +} + +.sidebar-panel[lwt-sidebar-brighttext] .sidebar-placesTreechildren::-moz-tree-twisty { + list-style-image: url("../icons/pan-down-symbolic-dark.svg") !important; +} +.sidebar-panel[lwt-sidebar-brighttext] .sidebar-placesTreechildren::-moz-tree-twisty(open) { + list-style-image: url("../icons/pan-end-symbolic-dark.svg") !important; +} +/* Sidebar: History: clock icon */ +#historyTree treechildren::-moz-tree-image { + list-style-image: url("../icons/preferences-system-time-symbolic.svg") !important; +} + +/* Menu checkbox */ +menuitem[type="checkbox"] { + list-style-image: url("../icons/checkbox-symbolic.svg") !important; +} +menuitem[type="checkbox"][checked="true"] { + list-style-image: url("../icons/checkbox-checked-symbolic.svg") !important; +} +menuitem[type="checkbox"][disabled="true"] .menu-iconic-icon { + opacity: 0.5; +} +menuitem[type="checkbox"]:not([disabled="true"]):hover .menu-iconic-icon { + filter: var(--gnome-button-color); +} + +/* Menu radio */ +menuitem[type="radio"] { + list-style-image: url("../icons/radio-symbolic.svg") !important; +} +menuitem[type="radio"][checked="true"] { + list-style-image: url("../icons/radio-checked-symbolic.svg") !important; +} +menuitem[type="radio"][disabled="true"] .menu-iconic-icon { + opacity: 0.5; +} +menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon { + filter: var(--gnome-button-color); +} + +/* Close button */ +.close-icon:not(.tab-close-button), +.identity-popup-permission-remove-button .button-icon { + list-style-image: url("../icons/window-close-symbolic.svg") !important; +} + +/* Window buttons */ +:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon, +:root[tabsintitlebar] #titlebar #titlebar-close .toolbarbutton-icon { + list-style-image: url("../icons/window-close-symbolic.svg") !important; +} +:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-max .toolbarbutton-icon, +:root[tabsintitlebar] #titlebar #titlebar-max .toolbarbutton-icon { + list-style-image: url("../icons/window-maximize-symbolic.svg") !important; +} +:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min .toolbarbutton-icon, +:root[tabsintitlebar] #titlebar #titlebar-min .toolbarbutton-icon { + list-style-image: url("../icons/window-minimize-symbolic.svg") !important; +} +:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-restore .toolbarbutton-icon, +:root[tabsintitlebar] #titlebar #titlebar-restore .toolbarbutton-icon, +:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max .toolbarbutton-icon, +:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max .toolbarbutton-icon { + list-style-image: url("../icons/window-unmaximize-symbolic.svg") !important; +} +:root[tabsintitlebar][inFullscreen] #window-controls #restore-button .toolbarbutton-icon { + list-style-image: url("../icons/view-restore-symbolic.svg") !important; +} + +/* Private browsing button */ +#privatebrowsing-button { + list-style-image: url("../icons/user-not-tracked.svg") !important; +} +/* Sidebar button */ +#sidebar-button:-moz-locale-dir(ltr):not([positionend]) .toolbarbutton-icon, #sidebar-button:-moz-locale-dir(rtl)[positionend] .toolbarbutton-icon { + list-style-image: url("../icons/toggle-sidebar-symbolic.svg") !important; +} +#sidebar-button .toolbarbutton-icon { + list-style-image: url("../icons/toggle-right-sidebar-symbolic.svg"); +} +/* Back button */ +#nav-bar #back-button .toolbarbutton-icon, +#context-back { + list-style-image: url("../icons/go-previous-symbolic.svg") !important; +} +/* Forward button */ +#nav-bar #forward-button .toolbarbutton-icon, +#context-forward { + list-style-image: url("../icons/go-next-symbolic.svg") !important; +} +/* Menu button */ +#PanelUI-menu-button { + list-style-image: url("../icons/open-menu-symbolic.svg") !important; +} +/* New tab button */ +#new-tab-button, +.tabs-newtab-button { + list-style-image: url("../icons/tab-new-symbolic.svg") !important; +} +/* Home button */ +#home-button { + list-style-image: url("../icons/user-home-symbolic.svg") !important; +} +/* Preferences button */ +#preferences-button { + list-style-image: url("../icons/preferences-system-symbolic.svg") !important; +} +/* Fullscreen button */ +#fullscreen-button, +#appMenu-fullscreen-button { + list-style-image: url("../icons/view-fullscreen-symbolic.svg") !important; +} +/* Zoom out button */ +#zoom-out-button, +#appMenu-zoomReduce-button { + list-style-image: url("../icons/zoom-out-symbolic.svg") !important; +} +/* Zoom in button */ +#zoom-in-button, +#appMenu-zoomEnlarge-button { + list-style-image: url("../icons/zoom-in-symbolic.svg") !important; +} +/* Developer button */ +#developer-button { + list-style-image: url("../icons/applications-engineering-symbolic.svg") !important; +} +/* Email link button */ +#email-link-button { + list-style-image: url("../icons/mail-unread-symbolic.svg") !important; +} +/* Print button */ +#print-button { + list-style-image: url("../icons/printer-symbolic.svg") !important; +} +/* Addons button */ +#add-ons-button { + list-style-image: url("../icons/application-x-addon-symbolic.svg") !important; +} +/* Find button */ +#find-button { + list-style-image: url("../icons/edit-find-symbolic.svg") !important; +} +/* New window button */ +#new-window-button { + list-style-image: url("../icons/window-new-symbolic.svg") !important; +} +/* Bookmarks menu button */ +#bookmarks-menu-button { + list-style-image: url("../icons/starred-symbolic.svg") !important; +} +/* History button */ +#history-panelmenu { + list-style-image: url("../icons/preferences-system-time-symbolic.svg") !important; +} +/* All tabs button */ +#alltabs-button { + list-style-image: url("../icons/pan-down-symbolic.svg") !important; +} +/* Cut button */ +#cut-button, +#appMenu-cut-button { + list-style-image: url("../icons/edit-cut-symbolic.svg") !important; +} +/* Copy button */ +#copy-button, +#appMenu-copy-button { + list-style-image: url("../icons/edit-copy-symbolic.svg") !important; +} +/* Paste button */ +#paste-button, +#appMenu-paste-button { + list-style-image: url("../icons/edit-paste-symbolic.svg") !important; +} +/* Overflow button */ +#nav-bar-overflow-button { + list-style-image: url("../icons/view-more-horizontal-symbolic.svg") !important; +} + +/* bookmark item */ +.bookmark-item[container] { + list-style-image: url("../icons/folder-symbolic.svg") !important; +} + +/* Invert icons color in dark variant */ + .PanelUI-subView .subviewbutton-nav::after, + .protections-popup-category::after, + .identity-popup-content-blocking-category::after, + #identity-popup-security-expander .button-icon, + .subviewbutton-back .toolbarbutton-icon, + + .menu-right, + + #urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon, + .searchbar-search-icon, + #search-box .textbox-search-sign, + + :root[tabsintitlebar][inFullscreen] #window-controls #restore-button .toolbarbutton-icon, + + .menulist-label-box:after, + .expander-down image, + .expander-up image, + #sidebar-switcher-arrow, + #viewButton .button-menu-dropmarker, + + menuitem[type="checkbox"]:not([disabled="true"]):not([hover="true"]):not([checked="true"]) .menu-iconic-icon, + menuitem[type="radio"]:not([disabled="true"]):not([hover="true"]):not([checked="true"]) .menu-iconic-icon, + + .close-icon:not(.tab-close-button) image, + .identity-popup-permission-remove-button .button-icon, + + #privatebrowsing-button .toolbarbutton-icon, + #sidebar-button:-moz-locale-dir(ltr):not([positionend]) .toolbarbutton-icon, + #sidebar-button:-moz-locale-dir(rtl)[positionend] .toolbarbutton-icon, + #sidebar-button .toolbarbutton-icon, + #nav-bar #back-button .toolbarbutton-icon, + #context-back .menu-iconic-icon, + #nav-bar #forward-button .toolbarbutton-icon, + #context-forward .menu-iconic-icon, + #PanelUI-menu-button .toolbarbutton-icon, + #new-tab-button .toolbarbutton-icon, + #alltabs-button .toolbarbutton-icon, + .tabs-newtab-button .toolbarbutton-icon, + #home-button .toolbarbutton-icon, + #preferences-button .toolbarbutton-icon, + #fullscreen-button .toolbarbutton-icon, + #appMenu-fullscreen-button .toolbarbutton-icon, + #zoom-out-button .toolbarbutton-icon, + #appMenu-zoomReduce-button .toolbarbutton-icon, + #zoom-in-button .toolbarbutton-icon, + #appMenu-zoomEnlarge-button .toolbarbutton-icon, + #developer-button .toolbarbutton-icon, + #email-link-button .toolbarbutton-icon, + #print-button .toolbarbutton-icon, + #add-ons-button .toolbarbutton-icon, + #find-button .toolbarbutton-icon, + #new-window-button .toolbarbutton-icon, + #bookmarks-menu-button .toolbarbutton-icon, + #history-panelmenu .toolbarbutton-icon, + #alltabs-button .toolbarbutton-icon, + #cut-button .toolbarbutton-icon, + #appMenu-cut-button .toolbarbutton-icon, + #copy-button .toolbarbutton-icon, + #appMenu-copy-button .toolbarbutton-icon, + #paste-button .toolbarbutton-icon, + #appMenu-paste-button .toolbarbutton-icon, + #nav-bar-overflow-button .toolbarbutton-icon { + filter: invert(100%) brightness(200%); + } + + .bookmark-item[container] .toolbarbutton-icon { + filter: invert(65%) brightness(150%); + } + + /* Tree views */ + treechildren::-moz-tree-twisty { + list-style-image: url("../icons/pan-down-symbolic-dark.svg") !important; + } + treechildren::-moz-tree-twisty(open) { + list-style-image: url("../icons/pan-end-symbolic-dark.svg") !important; + } + #historyTree treechildren::-moz-tree-image { + list-style-image: url("../icons/preferences-system-time-symbolic-dark.svg") !important; + } + + /* Window buttons */ + :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon, + :root[tabsintitlebar] #titlebar #titlebar-close .toolbarbutton-icon { + list-style-image: url("../icons/window-close-symbolic-dark.svg") !important; + } + :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-max .toolbarbutton-icon, + :root[tabsintitlebar] #titlebar #titlebar-max .toolbarbutton-icon { + list-style-image: url("../icons/window-maximize-symbolic-dark.svg") !important; + } + :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min .toolbarbutton-icon, + :root[tabsintitlebar] #titlebar #titlebar-min .toolbarbutton-icon { + list-style-image: url("../icons/window-minimize-symbolic-dark.svg") !important; + } + :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-restore .toolbarbutton-icon, + :root[tabsintitlebar] #titlebar #titlebar-restore .toolbarbutton-icon, + :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max .toolbarbutton-icon, + :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max .toolbarbutton-icon { + list-style-image: url("../icons/window-unmaximize-symbolic-dark.svg") !important; + } + :root[tabsintitlebar][inFullscreen] #window-controls #restore-button .toolbarbutton-icon { + list-style-image: url("../icons/view-restore-symbolic-dark.svg") !important; + } + + /* Fix for extensions icons */ + .webextension-browser-action { + list-style-image: var(--webextension-menupanel-image-dark, inherit) !important; + } diff --git a/src/firefox/chrome/Orchis/parts/popups.css b/src/firefox/chrome/Orchis/parts/popups.css index cef3ecf..71c678f 100644 --- a/src/firefox/chrome/Orchis/parts/popups.css +++ b/src/firefox/chrome/Orchis/parts/popups.css @@ -31,6 +31,16 @@ menuitem[type="checkbox"] image, menuitem[type="radio"] image { visibility: visible !important; } +menuitem:hover, menupopup menu:hover, +menubar > menu:hover { + color: var(--gnome-button-color) !important; + background: var(--gnome-button-hover-background) !important; +} + +menuitem[disabled="true"], menupopup menu[disabled="true"] { + color: var(--gnome-button-disabled-color) !important; +} + menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover { background: transparent !important; } diff --git a/src/firefox/chrome/Orchis/parts/toolbox.css b/src/firefox/chrome/Orchis/parts/toolbox.css index 199ffde..9875425 100644 --- a/src/firefox/chrome/Orchis/parts/toolbox.css +++ b/src/firefox/chrome/Orchis/parts/toolbox.css @@ -36,6 +36,11 @@ box-shadow: none !important; } +:root:-moz-lwtheme-brighttext, toolbar[brighttext] { + --toolbarbutton-hover-background: var(--gnome-button-hover-background) !important; + --toolbarbutton-active-background: var(--gnome-button-active-background) !important; +} + #TabsToolbar:-moz-window-inactive, #toolbar-menubar:-moz-window-inactive, #tabbrowser-tabs:-moz-window-inactive { diff --git a/src/firefox/chrome/Orchis/theme-dark.css b/src/firefox/chrome/Orchis/theme-dark.css index 7a20b5c..0a2d886 100644 --- a/src/firefox/chrome/Orchis/theme-dark.css +++ b/src/firefox/chrome/Orchis/theme-dark.css @@ -8,7 +8,7 @@ @import "parts/findbar.css"; @import "parts/remove-white-flash.css"; @import "parts/custom-icons.css"; -@import "parts/icons.css"; +@import "parts/icons-dark.css"; @import "colors/keep-dark.css"; @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";