Bug 1146269 - Update styling for "More Information" button r=Gijs
authorTim Taubert <ttaubert@mozilla.com>
Thu, 28 May 2015 14:35:34 +0200
changeset 269631 1fa49d1c999ba5bf594785a55879ea4f84912400
parent 269630 13a00d0dffa615fea49042bd38e8c6a7d4ebd590
child 269632 f3fef0aaa4ca64ff252636ed80effedebf906f7f
push id2540
push userwcosta@mozilla.com
push dateWed, 03 Jun 2015 20:55:41 +0000
reviewersGijs
bugs1146269
milestone41.0a1
Bug 1146269 - Update styling for "More Information" button r=Gijs
browser/base/content/browser.js
browser/components/controlcenter/content/panel.inc.xul
browser/locales/en-US/chrome/browser/browser.dtd
browser/themes/linux/controlcenter/panel.css
browser/themes/osx/controlcenter/panel.css
browser/themes/shared/controlcenter/panel.inc.css
browser/themes/windows/controlcenter/panel.css
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -7038,18 +7038,16 @@ var gIdentityHandler = {
       self._identityBox.removeAttribute("open");
     }, false);
 
     // Now open the popup, anchored off the primary chrome element
     this._identityPopup.openPopup(this._identityIcon, "bottomcenter topleft");
   },
 
   onPopupShown : function(event) {
-    document.getElementById('identity-popup-more-info-button').focus();
-
     this._identityPopup.addEventListener("blur", this, true);
     this._identityPopup.addEventListener("popuphidden", this);
   },
 
   onDragStart: function (event) {
     if (gURLBar.getAttribute("pageproxystate") != "valid")
       return;
 
--- a/browser/components/controlcenter/content/panel.inc.xul
+++ b/browser/components/controlcenter/content/panel.inc.xul
@@ -47,13 +47,13 @@
         <label class="identity-popup-label header"
                value="&identity.permissions;"/>
         <vbox id="identity-popup-permission-list" class="indent"/>
       </vbox>
     </vbox>
   </hbox>
   <!-- Footer button to open security page info -->
   <hbox id="identity-popup-button-container" align="center">
-    <button id="identity-popup-more-info-button"
-            label="&identity.moreInfoLinkText;"
+    <button id="identity-popup-more-info-button" flex="1"
+            label="&identity.moreInfoLinkText2;"
             oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
   </hbox>
 </panel>
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -681,17 +681,17 @@ which is run by
 Example Enterprises, Inc.
 
 The layout of the identity dialog prevents combining this into a single string with
 substitution variables.  If it is difficult to translate the sense of the string
 with that structure, consider a translation which ignores the preceding domain and
 just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY identity.runBy "which is run by">
 
-<!ENTITY identity.moreInfoLinkText "More Information…">
+<!ENTITY identity.moreInfoLinkText2 "More Information">
 
 <!ENTITY identity.permissions "Permissions">
 
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "Browser tabs">
 
 <!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu -->
--- a/browser/themes/linux/controlcenter/panel.css
+++ b/browser/themes/linux/controlcenter/panel.css
@@ -67,14 +67,8 @@
 #identity-popup > .panel-arrowcontainer > .panel-arrowcontent {
   padding: 0;
 }
 
 #identity-popup-container {
   min-width: 280px;
   padding: 10px;
 }
-
-#identity-popup-button-container {
-  background: linear-gradient(to bottom, rgba(0,0,0,0.04) 60%, transparent);
-  padding: 10px;
-  margin-top: 5px;
-}
--- a/browser/themes/osx/controlcenter/panel.css
+++ b/browser/themes/osx/controlcenter/panel.css
@@ -1,13 +1,12 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-%include ../shared.inc
 %include ../../shared/controlcenter/panel.inc.css
 
 /* Popup Icons */
 #identity-popup-icon {
   height: 64px;
   width: 64px;
   padding: 0;
   list-style-image: url("chrome://browser/skin/identity.png");
@@ -95,30 +94,8 @@
 
 #identity-popup > .panel-arrowcontainer > .panel-arrowcontent {
   padding: 0;
 }
 
 #identity-popup-container {
   padding: 16px;
 }
-
-#identity-popup-button-container {
-  background-color: hsla(210,4%,10%,.07);
-  border-top: 1px solid hsla(210,4%,10%,.12);
-  padding: 16px;
-  margin-top: 5px;
-}
-
-/* Popup Buttons */
-#identity-popup-more-info-button {
-  @hudButton@
-  margin: 10px 0 0;
-  min-height: 0px;
-}
-
-#identity-popup-more-info-button:focus {
-  @hudButtonFocused@
-}
-
-#identity-popup-more-info-button:hover:active {
-  @hudButtonPressed@
-}
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -1,13 +1,12 @@
 #identity-popup-content-box:not(.chromeUI) > #identity-popup-brandName,
 #identity-popup-content-box:not(.chromeUI) > #identity-popup-chromeLabel,
 #identity-popup-content-box.chromeUI > .identity-popup-label:not(#identity-popup-brandName):not(#identity-popup-chromeLabel),
 #identity-popup-content-box.chromeUI > .identity-popup-description,
-#identity-popup.chromeUI > #identity-popup-button-container,
 #identity-popup-content-box.unknownIdentity > #identity-popup-connectedToLabel ,
 #identity-popup-content-box.unknownIdentity > #identity-popup-runByLabel ,
 #identity-popup-content-box.unknownIdentity > #identity-popup-content-host ,
 #identity-popup-content-box.unknownIdentity > #identity-popup-content-owner ,
 #identity-popup-content-box.verifiedIdentity > #identity-popup-connectedToLabel2 ,
 #identity-popup-content-box.verifiedDomain > #identity-popup-connectedToLabel2 ,
 #identity-popup-content-box.verifiedDomain > #identity-popup-runByLabel {
   display: none;
@@ -23,14 +22,38 @@
   margin-top: .5em;
   margin-bottom: .5em;
 }
 
 #identity-popup-content-box {
   max-width: 50ch;
 }
 
+#identity-popup-button-container {
+  background-color: hsla(210,4%,10%,.07);
+}
+
+#identity-popup-more-info-button {
+  border: none;
+  border-top: 1px solid hsla(210,4%,10%,.14);
+  background: transparent;
+  -moz-appearance: none;
+  margin-top: 5px;
+  padding: 1.1em;
+  margin: 0;
+}
+
+#identity-popup-more-info-button:hover {
+  background-color: hsla(210,4%,10%,.07);
+}
+
+#identity-popup-more-info-button:hover:active {
+  color: inherit;
+  background-color: hsla(210,4%,10%,.12);
+  box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset;
+}
+
 @media (min-resolution: 1.1dppx) {
   #identity-popup.chromeUI > #identity-popup-container > #identity-popup-icon {
     list-style-image: url("chrome://branding/content/icon128.png");
     -moz-image-region: rect(0, 128px, 128px, 0);
   }
 }
--- a/browser/themes/windows/controlcenter/panel.css
+++ b/browser/themes/windows/controlcenter/panel.css
@@ -67,28 +67,16 @@
   -moz-margin-start: -24px;
 }
 
 #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon ,
 #identity-popup-content-box.verifiedDomain > #identity-popup-encryption > vbox > #identity-popup-encryption-icon {
   list-style-image: url("chrome://browser/skin/Secure24.png");
 }
 
-#identity-popup-more-info-button {
-  margin-top: 6px;
-  margin-bottom: 0;
-  -moz-margin-end: 0;
-}
-
 #identity-popup > .panel-arrowcontainer > .panel-arrowcontent {
   padding: 0;
 }
 
 #identity-popup-container {
   min-width: 280px;
   padding: 10px;
 }
-
-#identity-popup-button-container {
-  background: linear-gradient(to bottom, rgba(0,0,0,0.04) 60%, transparent);
-  padding: 10px;
-  margin-top: 5px;
-}