clean merge conflict

[themes.git] / EarlyBlue / global / global.css

diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css
index e81bc966465560a949e9947799693741ee2a499a..1077ca50052b4bcaa8f2b7641624215241d9e34d 100644 (file)
--- a/EarlyBlue/global/global.css
+++ b/EarlyBlue/global/global.css
@@ -62,7 +62,7 @@ menulist > menupopup,
 }
 
 .menulist-compact {
-  -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-compact");
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#menulist-compact");
 }
 
 /*
@@ -96,7 +96,8 @@ window.dialog {
 .message-icon,
 .alert-icon,
 .error-icon,
-.question-icon {
+.question-icon,
+.authentication-icon {
   width: 32px;
   height: 32px;
 }
@@ -113,7 +114,8 @@ window.dialog {
   list-style-image: url("chrome://global/skin/icons/alert-error.gif");
 }
 
-.question-icon {
+.question-icon,
+.authentication-icon {
   list-style-image: url("chrome://global/skin/icons/alert-question.gif");
 }
 
@@ -139,7 +141,7 @@ statusbar {
 statusbarpanel {
   -moz-box-align: center;
   -moz-box-pack: center;
-  padding: 0px 1px 0px 1px;
+  padding: 0px 1px;
 }
 
 
@@ -171,7 +173,7 @@ resizer[dir="bottomright"] {
   border: 0px;
   margin: -14px;
   padding: 0px;
-  background-image: url("chrome://communicator/skin/icons/autoscroll.png");
+  background-image: url("chrome://global/skin/icons/autoscroll.png");
   background-color: transparent;
   -moz-appearance: none;
 }