diff --git a/css/leptonContent.css b/css/leptonContent.css index f6465054..09dabb96 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -3265,12 +3265,15 @@ /** Menu - Icons Layout *******************************************************/ @supports not -moz-bool-pref("userChrome.icon.disabled") { @supports -moz-bool-pref("userChrome.icon.menu") { - :root { - --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { + @-moz-document url-prefix("about:"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") + { :root { - --uc-folder-icon: url("../icons/folder.svg"); + --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + :root { + --uc-folder-icon: url("../icons/folder.svg"); + } } } @-moz-document url("chrome://browser/content/places/places.xhtml"), url("about:downloads") @@ -7071,16 +7074,17 @@ } /** Menu - Icons Layout *******************************************************/ @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { - :root { - --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); - } -} -@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") { - :root { - --uc-folder-icon: url("../icons/folder.svg"); + @-moz-document url-prefix("about:"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") + { + :root { + --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + } + @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") { + :root { + --uc-folder-icon: url("../icons/folder.svg"); + } + } } -} -@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { @-moz-document url("chrome://browser/content/places/places.xhtml"), url("about:downloads") { menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]), @@ -7452,8 +7456,6 @@ } } } -} -@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { @-moz-document url-prefix("about:addons") { @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { button[role="menuitem"] { @@ -7484,8 +7486,6 @@ } } } -} -@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { @-moz-document url-prefix("about:logins") { @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { .menuitem-export { diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index 52ce9250..8d41bd52 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -3268,12 +3268,15 @@ /** Menu - Icons Layout *******************************************************/ @supports not -moz-bool-pref("userChrome.icon.disabled") { @supports -moz-bool-pref("userChrome.icon.menu") { - :root { - --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { + @-moz-document url-prefix("about:"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") + { :root { - --uc-folder-icon: url("../icons/folder.svg"); + --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + :root { + --uc-folder-icon: url("../icons/folder.svg"); + } } } @-moz-document url("chrome://browser/content/places/places.xhtml"), url("about:downloads") diff --git a/src/contents/_context_menu.scss b/src/contents/_context_menu.scss index daec5c74..c505af79 100644 --- a/src/contents/_context_menu.scss +++ b/src/contents/_context_menu.scss @@ -1,6 +1,12 @@ @import "../icons/shared"; -:root { - @include initIcons; + +@include moz-document( + url-prefix "about:", + regexp "^(((jar:)?file:\/\/\/)|(chrome:\/\/)).*\/$" +) { + :root { + @include initIcons; + } } @include moz-document(