Commit 6acc7fef authored by Carsten "Tomcat" Book's avatar Carsten "Tomcat" Book
Browse files

merge fx-team to mozilla-central a=merge

parents b7ff0cc9 f720fc6c

browser/extensions/pocket/skin/windows/pocket.css

+1 −1
Original line number Diff line number Diff line
@@ -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);

  }

}

browser/themes/linux/browser.css

+0 −4
Original line number Diff line number Diff line
@@ -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,

browser/themes/shared/plugin-doorhanger.inc.css

+1 −1
Original line number Diff line number Diff line
@@ -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;