diff --git a/theme/shared/browser/extensions/adblock-plus.inc.css b/theme/shared/browser/extensions/adblock-plus.inc.css index 5bf7b64d..e939df4b 100644 --- a/theme/shared/browser/extensions/adblock-plus.inc.css +++ b/theme/shared/browser/extensions/adblock-plus.inc.css @@ -4,24 +4,45 @@ * URL: https://addons.mozilla.org/firefox/addon/adblock-plus/ */ %endif -#abp-toolbarbutton { - list-style-image: url(chrome://symbolic-icons/skin/extensions/adblock-plus.svg) !important; - -moz-image-region: auto !important; +/* Default */ +#abp-toolbarbutton .toolbarbutton-icon { + list-style-image: url(chrome://symbolic-icons/skin/extensions/adblock-plus.svg#default); + -moz-image-region: auto; } +#abp-toolbarbutton[cui-areatype="menu-panel"] .toolbarbutton-icon { + list-style-image: url(chrome://symbolic-icons/skin/extensions/adblock-plus.svg#default-panel); + -moz-image-region: auto; +} + +#main-window[darkvariant="toolbar"] #abp-toolbarbutton[cui-areatype="toolbar"] .toolbarbutton-icon, +#main-window[darkvariant="full"] #abp-toolbarbutton .toolbarbutton-icon { + list-style-image: url(chrome://symbolic-icons/skin/extensions/adblock-plus.svg#default-bright); + -moz-image-region: auto; +} + +/* Stopped */ #abp-toolbarbutton[abpstate="disabled"] .toolbarbutton-icon, #abp-toolbarbutton[abpstate="whitelisted"] .toolbarbutton-icon { - list-style-image: url(chrome://symbolic-icons/skin/extensions/adblock-plus-stopped.svg) !important; - -moz-image-region: auto !important; + list-style-image: url(chrome://symbolic-icons/skin/extensions/adblock-plus.svg#stopped); + -moz-image-region: auto; } -#abp-toolbarbutton[cui-areatype="menu-panel"] .toolbarbutton-icon, -toolbarpaletteitem[place="palette"] > #abp-toolbarbutton .toolbarbutton-icon { - opacity: .6; +#abp-toolbarbutton[abpstate="disabled"][cui-areatype="menu-panel"] .toolbarbutton-icon, +#abp-toolbarbutton[abpstate="whitelisted"][cui-areatype="menu-panel"] .toolbarbutton-icon { + list-style-image: url(chrome://symbolic-icons/skin/extensions/adblock-plus.svg#stopped-panel); + -moz-image-region: auto; } -#abp-toolbarbutton:-moz-any([abpstate="disabled"], [abpstate="whitelisted"])[cui-areatype="menu-panel"] .toolbarbutton-icon, -toolbarpaletteitem[place="palette"] > #abp-toolbarbutton:-moz-any([abpstate="disabled"], [abpstate="whitelisted"]) .toolbarbutton-icon { - list-style-image: url(chrome://symbolic-icons/skin/extensions/adblock-plus-stopped-menuPanel.svg) !important; - opacity: 1; +#main-window[darkvariant="toolbar"] #abp-toolbarbutton:-moz-any([abpstate="disabled"], [abpstate="whitelisted"])[cui-areatype="toolbar"] .toolbarbutton-icon, +#main-window[darkvariant="full"] #abp-toolbarbutton:-moz-any([abpstate="disabled"], [abpstate="whitelisted"]) .toolbarbutton-icon { + list-style-image: url(chrome://symbolic-icons/skin/extensions/adblock-plus.svg#stopped-bright); + -moz-image-region: auto; } + +/* Palette */ +toolbarpaletteitem[place="palette"] > #abp-toolbarbutton .toolbarbutton-icon { + list-style-image: url(chrome://symbolic-icons/skin/extensions/adblock-plus.svg#default-panel) !important; + -moz-image-region: auto; +} + diff --git a/theme/shared/symbolic-icons/extensions/adblock-plus-stopped-menuPanel.svg b/theme/shared/symbolic-icons/extensions/adblock-plus-stopped-menuPanel.svg deleted file mode 100644 index 7d657c7f..00000000 --- a/theme/shared/symbolic-icons/extensions/adblock-plus-stopped-menuPanel.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - diff --git a/theme/shared/symbolic-icons/extensions/adblock-plus-stopped.svg b/theme/shared/symbolic-icons/extensions/adblock-plus-stopped.svg deleted file mode 100644 index 087a558c..00000000 --- a/theme/shared/symbolic-icons/extensions/adblock-plus-stopped.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - diff --git a/theme/shared/symbolic-icons/extensions/adblock-plus.svg b/theme/shared/symbolic-icons/extensions/adblock-plus.svg index cd267707..41d6c8fa 100644 --- a/theme/shared/symbolic-icons/extensions/adblock-plus.svg +++ b/theme/shared/symbolic-icons/extensions/adblock-plus.svg @@ -1,21 +1,75 @@ - - - - - -image/svg+xml - -Gnome Symbolic Icon Theme - - - - - - -Gnome Symbolic Icon Theme - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +