merge fx-team to mozilla-central a=merge

This commit is contained in:
Carsten "Tomcat" Book 2016-09-15 11:58:32 +02:00
commit 6acc7fef72
3 changed files with 2 additions and 6 deletions

View File

@ -11,6 +11,6 @@
@media (-moz-windows-theme: luna-silver) and (max-resolution: 1dppx) {
#pocket-button {
list-style-image: url(chrome://pocket/skin/toolbar-lunaSilver.png)
list-style-image: url(Toolbar-lunaSilver.png);
}
}

View File

@ -578,10 +578,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
list-style-image: url("moz-icon://stock/gtk-about?size=menu");
}
#javascriptConsole {
list-style-image: url("chrome://global/skin/console/console.png");
}
/* Primary toolbar buttons */
:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon,

View File

@ -18,7 +18,7 @@
}
.center-item-warning-icon {
background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.svg");
background-repeat: no-repeat;
width: 16px;
height: 15px;