From f6d302181ce7c4e4157b1ebdfd5a80f4293411f7 Mon Sep 17 00:00:00 2001
From: "reed@reedloden.com" <reed@reedloden.com>
Date: Tue, 11 Dec 2007 02:27:55 -0800
Subject: [PATCH] =?UTF-8?q?Bug=20406321=20-=20"Identity=20portion=20of=20u?=
 =?UTF-8?q?rlbar=20doesn't=20turn=20green=20with=20EV=20Certificates=20und?=
 =?UTF-8?q?er=20win32=20and=20Linux"=20[p=3Ddao@mozilla.com=20(D=C3=A3o=20?=
 =?UTF-8?q?Gottwald)=20r=3Dmconnor=20a=3Dblocking-firefox3+]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 browser/base/content/browser.xul              | 30 ++++++++++---------
 .../themes/gnomestripe/browser/browser.css    |  6 +++-
 browser/themes/pinstripe/browser/browser.css  | 10 +++----
 browser/themes/winstripe/browser/browser.css  | 10 +++----
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 453b36e41268..c42529828147 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -268,21 +268,23 @@
                  ontextreverted="return handleURLBarRevert();">
           <!-- Use onclick instead of normal popup= syntax since the popup
                code fires onmousedown, and hence eats our favicon drag events -->
-          <box id="identity-box" align="center" 
+          <box id="identity-box"
                onclick="getIdentityHandler().handleIdentityClick(event);">
-            <deck id="page-proxy-deck" onclick="PageProxyClickHandler(event);">
-              <image id="page-proxy-button"
-                     ondraggesture="PageProxyDragGesture(event);"
-                     tooltiptext="&proxyIcon.tooltip;"/>
-              <image id="page-proxy-favicon" validate="never"
-                     ondraggesture="PageProxyDragGesture(event);"
-                     onload="this.parentNode.selectedIndex = 1;
-                             event.stopPropagation();"
-                     onerror="this.removeAttribute('src');
-                              this.parentNode.selectedIndex = 0;"
-                     tooltiptext="&proxyIcon.tooltip;"/>
-            </deck>
-            <label id="identity-icon-label"/>
+            <hbox align="center">
+              <deck id="page-proxy-deck" onclick="PageProxyClickHandler(event);">
+                <image id="page-proxy-button"
+                       ondraggesture="PageProxyDragGesture(event);"
+                       tooltiptext="&proxyIcon.tooltip;"/>
+                <image id="page-proxy-favicon" validate="never"
+                       ondraggesture="PageProxyDragGesture(event);"
+                       onload="this.parentNode.selectedIndex = 1;
+                               event.stopPropagation();"
+                       onerror="this.removeAttribute('src');
+                                this.parentNode.selectedIndex = 0;"
+                       tooltiptext="&proxyIcon.tooltip;"/>
+              </deck>
+              <label id="identity-icon-label"/>
+            </hbox>
           </box>
           <hbox id="urlbar-icons">
             <button type="menu"
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index 510153da6767..e7c90a1c27c8 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -801,7 +801,11 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   margin: 0;
 }
 
-.unknownIdentity > #identity-icon-label {
+#identity-box.verifiedIdentity > hbox {
+  background-color: rgba(0, 255, 0, 0.25);
+}
+
+#identity-box.unknownIdentity > hbox > #identity-icon-label {
   display: none;
 }
 
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index 44c34db1e627..5516f8db0d24 100755
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -1634,10 +1634,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   opacity: 1.0;
 }
 
-#identity-box.verifiedIdentity {
-  background-color: #BFA;
-}
-
 #urlbar[level="high"] > #identity-box,
 #urlbar[level="low"] > #identity-box {
   /* urlbar adds padding when security level is set, which we need to
@@ -1653,7 +1649,11 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
     vertical-align: middle;
 }
 
-.unknownIdentity > #identity-icon-label {
+#identity-box.verifiedIdentity {
+  background-color: #BFA;
+}
+
+#identity-box.unknownIdentity > hbox > #identity-icon-label {
     display: none;
 }
 
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index b7e3f1ccfc13..8c465551415e 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -1668,10 +1668,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   -moz-outline-radius-bottomleft: 2px;
 }
 
-#identity-box.verifiedIdentity {
-  outline-color: highlight;
-}
-
 #identity-box:hover {
   outline-color: ThreeDDarkShadow;
 }
@@ -1681,7 +1677,11 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   margin: 0;
 }
 
-.unknownIdentity > #identity-icon-label {
+#identity-box.verifiedIdentity > hbox {
+  background-color: rgba(0, 255, 0, 0.25);
+}
+
+#identity-box.unknownIdentity > hbox > #identity-icon-label {
   display: none;
 }