Back out bug 383183 due to unit test failures and perf regression

browser/themes/gnomestripe/browser/browser.css

@@ -850,7 +850,7 @@ toolbar[iconsize="small"] #paste-button:not([disabled="true"]):hover:active {
   margin-bottom: 2px;
   margin-top: 2px;
   -moz-margin-end: 0px;
-  -moz-margin-start: 0px;
+  -moz-margin-start: 3px;
   width: 7em;
   min-width: 7em;
 
@@ -1793,6 +1793,43 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
   color: #000000;
 }
 
+#urlbar[level="high"] #lock-icon {
+  -moz-image-region: rect(0px, 18px, 18px, 0px);
+  list-style-image: url("chrome://browser/skin/Secure.png");
+}
+#urlbar[level="high"] #lock-icon:hover {
+  -moz-image-region: rect(18px, 18px, 36px, 0px);
+  list-style-image: url("chrome://browser/skin/Secure.png");
+}
+#urlbar[level="high"] #lock-icon:active {
+  -moz-image-region: rect(36px, 18px, 54px, 0px);
+  list-style-image: url("chrome://browser/skin/Secure.png");
+}
+#urlbar[level="low"] #lock-icon {
+  -moz-image-region: rect(0px, 18px, 18px, 0px);
+  list-style-image: url("chrome://browser/skin/Secure.png");
+}
+#urlbar[level="low"] #lock-icon:hover {
+  -moz-image-region: rect(18px, 18px, 36px, 0px);
+  list-style-image: url("chrome://browser/skin/Secure.png");
+}
+#urlbar[level="low"] #lock-icon:active {
+  -moz-image-region: rect(36px, 18px, 54px, 0px);
+  list-style-image: url("chrome://browser/skin/Secure.png");
+}
+#urlbar[level="broken"] #lock-icon {
+  -moz-image-region: rect(0px, 18px, 18px, 0px);
+  list-style-image: url("chrome://browser/skin/Security-broken.png");
+}
+#urlbar[level="broken"] #lock-icon:hover {
+  -moz-image-region: rect(18px, 18px, 36px, 0px);
+  list-style-image: url("chrome://browser/skin/Security-broken.png");
+}
+#urlbar[level="broken"] #lock-icon:active {
+  -moz-image-region: rect(36px, 18px, 54px, 0px);
+  list-style-image: url("chrome://browser/skin/Security-broken.png");
+}
+
 %ifdef MOZ_WIDGET_GTK2
 #urlbar > .autocomplete-textbox-container {
   -moz-binding: url(chrome://browser/skin/browser.xml#autocomplete-security-wrapper);
@@ -1905,109 +1942,3 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 .bookmark-item[dragover-bottom="true"] {
   -moz-border-bottom-colors: #000000;
 }
-
-/* ::::: Identity Indicator Styling ::::: */
-/* Location bar visuals*/
-#identity-box {
-  /* Extend our margins out so that our highlight/separator bar covers the
-    location bar properly */
-  margin: -1px 2px -2px -2px;
-  padding: 0 2px 0 1px;
-  border-right: 1px solid #888;
-  background-color: white;
-  opacity: 0.9;
-}
-
-#identity-box:hover {
-  opacity: 1.0;
-}
-
-#identity-box.verifiedIdentity {
-  background-color: #BFA;
-}
-
-#identity-icon-label {
-    padding: 1px 2px 2px;
-    margin: 0;
-    color: black;
-    vertical-align: middle;
-}
-
-.unknownIdentity > #identity-icon-label {
-    display: none;
-}
-
-/* Popup Icons */
-#identity-popup-icon {
-    height: 64px;
-    width: 64px;
-    padding: 0;
-    margin: 10px 0 0;
-    list-style-image: url("chrome://browser/skin/identity.png");
-    -moz-image-region: rect(0px, 64px, 64px, 0px);
-}
-
-.verifiedDomain > #identity-popup-container > #identity-popup-icon {
-    -moz-image-region: rect(64px, 64px, 128px, 0px);
-}
-
-.verifiedIdentity > #identity-popup-container > #identity-popup-icon {
-    -moz-image-region: rect(128px, 64px, 192px, 0px);
-}
-
-/* Popup Title */
-#identity-popup-title {
-    font-size: 120%;
-    font-weight: bold;
-}
-
-.verifiedIdentity > #identity-popup-title {
-    color: #6A6;
-}
-
-.unknownIdentity > #identity-popup-title {
-    color: #999;
-}
-
-.verifiedDomain > #identity-popup-title {
-    color: black;
-}
-
-/* Popup Body Text */
-#identity-popup-content-box > description,
-#identity-popup-encryption-label {
-    white-space: -moz-pre-wrap;
-    color: black;
-    padding-left: 10px;
-}
-
-#identity-popup-content {
-    padding-top: 5px;
-    margin-bottom: 0;
-    max-width: 200px;
-}
-
-.verifiedIdentity > #identity-popup-content,
-.verifiedDomain > #identity-popup-content {
-   font-size: 140%;
-   font-weight: bold;
-   max-width: 300px;
-}
-
-#identity-popup-encryption {
-  margin: 10px 0;
-}
-
-.verifiedIdentity > #identity-popup-encryption > * > #identity-popup-encryption-icon,
-.verifiedDomain > #identity-popup-encryption > * >#identity-popup-encryption-icon {
-  list-style-image: url("chrome://browser/skin/Secure.png");
-  -moz-image-region: rect(0px, 18px, 18px, 0px);
-}
-
-/* Popup Bounding Box */
-#identity-popup-container {
-    background-image: none;
-    background-color: white;
-    min-width: 280px;
-    padding: 10px;
-}

browser/themes/gnomestripe/browser/jar.mn

@@ -4,7 +4,6 @@ classic.jar:
         skin/classic/browser/browser.xml
 *       skin/classic/browser/engineManager.css                  (engineManager.css)
         skin/classic/browser/Info.png
-        skin/classic/browser/identity.png
         skin/classic/browser/pageInfo.css
         skin/classic/browser/pageInfo.png
         skin/classic/browser/page-livemarks.png