Bug 353194: Statusbar changes size depending on whether lock icon appears; Wrong broken image in addressbar, r=mano

git-svn-id: svn://10.0.0.236/trunk@216793 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/browser/themes/pinstripe/browser/browser.css

@@ -882,7 +882,16 @@ toolbar[iconsize="small"] #paste-button:hover:active {
 }
 
 #urlbar[level="broken"] #lock-icon {
-  list-style-image: url("chrome://browser/skin/Secure-urlbar-broken.png");
+  list-style-image: url("chrome://browser/skin/Security-broken.png");
+  -moz-image-region: rect(0px, 18px, 18px, 0px);
+}
+
+#urlbar[level="broken"] #lock-icon:hover {
+  -moz-image-region: rect(18px, 18px, 36px, 0px);
+}
+
+#urlbar[level="broken"] #lock-icon:active {
+  -moz-image-region: rect(36px, 18px, 54px, 0px);
 }
 
 #urlbar-container {
@@ -1036,20 +1045,17 @@ sidebarheader > .tabs-closebutton > .toolbarbutton-text {
 }
 
 #security-button[level="high"] {
-  list-style-image: url("chrome://browser/skin/Secure.png");
-  -moz-image-region: rect(36px, 18px, 54px, 0px);
+  list-style-image: url("chrome://browser/skin/Secure-statusbar.png");
   display: -moz-box;
 }
 
 #security-button[level="low"] {
-  list-style-image: url("chrome://browser/skin/Secure.png");
-  -moz-image-region: rect(36px, 18px, 54px, 0px);
+  list-style-image: url("chrome://browser/skin/Secure-statusbar.png");
   display: -moz-box;
 }
 
 #security-button[level="broken"] {
-  list-style-image: url("chrome://browser/skin/Security-broken.png");
-  -moz-image-region: rect(36px, 18px, 54px, 0px);
+  list-style-image: url("chrome://browser/skin/Secure-statusbar-broken.png");
   display: -moz-box;
 }
 

mozilla/browser/themes/pinstripe/browser/jar.mn

@@ -13,8 +13,6 @@ classic.jar:
   skin/classic/browser/find-bar-background.png
   skin/classic/browser/Go.png
   skin/classic/browser/Info.png
-  skin/classic/browser/lock-insecure.gif
-  skin/classic/browser/lock-mixed.gif
   skin/classic/browser/page-livemarks.png
   skin/classic/browser/livemark-item.png
   skin/classic/browser/pageInfo.css
@@ -25,8 +23,8 @@ classic.jar:
   skin/classic/browser/Search-provider-bkgnd.png
   skin/classic/browser/Secure.png
   skin/classic/browser/Security-broken.png
-  skin/classic/browser/Secure-urlbar.png
-  skin/classic/browser/Secure-urlbar-broken.png
+  skin/classic/browser/Secure-statusbar.png
+  skin/classic/browser/Secure-statusbar-broken.png
   skin/classic/browser/Secure-background.gif
   skin/classic/browser/Toolbar-small.png
   skin/classic/browser/Toolbar.png