Bug 1196053 - [Control Center] More Information button should be in the subpanel. r=jaws ui-r=shorlander a=sylvestre
authorDão Gottwald <dao@mozilla.com>
Thu, 27 Aug 2015 15:57:57 +0200
changeset 289212 9c3d4026787bfebe5165ef4d0bd1d3de5ab99779
parent 289211 f11f7872e2195715aabcd45c3efbdb8db89470d8
child 289213 f24900228e4d37594ad5fe79206d3c3a1b10aeb8
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws, shorlander, sylvestre
bugs1196053
milestone42.0a2
Bug 1196053 - [Control Center] More Information button should be in the subpanel. r=jaws ui-r=shorlander a=sylvestre
browser/components/controlcenter/content/panel.inc.xul
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/components/controlcenter/content/panel.inc.xul
+++ b/browser/components/controlcenter/content/panel.inc.xul
@@ -83,25 +83,16 @@
       <!-- Permissions Section -->
       <hbox id="identity-popup-permissions" class="identity-popup-section">
         <vbox id="identity-popup-permissions-content" flex="1">
           <label class="identity-popup-headline"
                  value="&identity.permissions;"/>
           <vbox id="identity-popup-permission-list"/>
         </vbox>
       </hbox>
-
-      <spacer flex="1"/>
-
-      <!-- More Information Button -->
-      <hbox id="identity-popup-button-container" align="center">
-        <button id="identity-popup-more-info-button" flex="1"
-                label="&identity.moreInfoLinkText2;"
-                oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
-      </hbox>
     </panelview>
 
     <!-- Security SubView -->
     <panelview id="identity-popup-securityView" flex="1">
       <vbox id="identity-popup-securityView-header">
         <label observes="identity-popup-content-host"/>
         <description class="identity-popup-connection-not-secure"
                      value="&identity.connectionNotSecure;"
@@ -126,16 +117,20 @@
         <!-- Connection is Not Secure -->
         <description when-connection="not-secure">&identity.description.insecure;</description>
 
         <!-- Weak Cipher -->
         <description when-ciphers="weak">&identity.description.weakCipher;</description>
         <description class="identity-popup-warning-yellow"
                      when-ciphers="weak">&identity.description.weakCipher2;</description>
 
+        <!-- More Security Information -->
+        <button label="&identity.moreInfoLinkText2;"
+                oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
+
         <!-- Active Mixed Content Blocked -->
         <description class="identity-popup-warning-gray"
                      when-mixedcontent="active-blocked">&identity.description.activeBlocked; <label observes="identity-popup-mcb-learn-more"/></description>
 
         <!-- Passive Mixed Content Loaded -->
         <description when-mixedcontent="passive-loaded">&identity.description.passiveLoaded;</description>
         <description class="identity-popup-warning-yellow"
                      when-mixedcontent="passive-loaded">&identity.description.passiveLoaded2; <label observes="identity-popup-mcb-learn-more"/></description>
@@ -154,11 +149,12 @@
                 label="&identity.disableMixedContentBlocking.label;"
                 accesskey="&identity.disableMixedContentBlocking.accesskey;"
                 oncommand="gIdentityHandler.disableMixedContentProtection()"/>
         <button when-mixedcontent="active-loaded"
                 label="&identity.enableMixedContentBlocking.label;"
                 accesskey="&identity.enableMixedContentBlocking.accesskey;"
                 oncommand="gIdentityHandler.enableMixedContentProtection()"/>
       </vbox>
+
     </panelview>
   </panelmultiview>
 </panel>
--- a/browser/themes/linux/controlcenter/panel.css
+++ b/browser/themes/linux/controlcenter/panel.css
@@ -1,15 +1,13 @@
 /* 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/controlcenter/panel.inc.css
 
-.identity-popup-expander:-moz-focusring,
-#identity-popup-more-info-button {
+.identity-popup-expander:-moz-focusring {
   padding: 1px;
 }
 
-.identity-popup-expander:-moz-focusring > .button-box,
-#identity-popup-more-info-button:-moz-focusring > .button-box {
+.identity-popup-expander:-moz-focusring > .button-box {
   outline: 1px -moz-dialogtext dotted;
 }
--- a/browser/themes/osx/controlcenter/panel.css
+++ b/browser/themes/osx/controlcenter/panel.css
@@ -4,23 +4,21 @@
 
 %include ../shared.inc
 %include ../../shared/controlcenter/panel.inc.css
 
 #identity-popup {
   margin-top: 1px;
 }
 
-.identity-popup-expander:-moz-focusring,
-#identity-popup-more-info-button {
+.identity-popup-expander:-moz-focusring {
   padding: 2px;
 }
 
-.identity-popup-expander:-moz-focusring > .button-box,
-#identity-popup-more-info-button:-moz-focusring > .button-box {
+.identity-popup-expander:-moz-focusring > .button-box {
   @hudButtonFocused@
 }
 
 #tracking-action-block,
 #tracking-action-unblock,
 #tracking-action-unblock-private,
 #identity-popup-securityView-body > button {
   @hudButton@
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -291,41 +291,8 @@ description#identity-popup-content-verif
 #identity-popup-permission-list {
   margin-top: 5px;
 }
 
 .identity-popup-permission-label {
   -moz-margin-start: 0;
 }
 
-/* FOOTER BUTTONS */
-
-#identity-popup-button-container {
-  background-color: hsla(210,4%,10%,.07);
-}
-
-#identity-popup-more-info-button {
-  border: none;
-  border-top: 1px solid var(--panel-separator-color);
-  background: transparent;
-  -moz-appearance: none;
-  margin-top: 5px;
-  margin: 0;
-}
-
-#identity-popup-more-info-button > .button-box {
-  -moz-appearance: none;
-  padding: 1em;
-}
-
-#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;
-}
-
-#identity-popup-more-info-button:-moz-focusring {
-  border-color: transparent;
-}
--- a/browser/themes/windows/controlcenter/panel.css
+++ b/browser/themes/windows/controlcenter/panel.css
@@ -1,15 +1,13 @@
 /* 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/controlcenter/panel.inc.css
 
-.identity-popup-expander:-moz-focusring,
-#identity-popup-more-info-button {
+.identity-popup-expander:-moz-focusring {
   padding: 1px;
 }
 
-.identity-popup-expander:-moz-focusring > .button-box,
-#identity-popup-more-info-button:-moz-focusring > .button-box {
+.identity-popup-expander:-moz-focusring > .button-box {
   outline: 1px -moz-dialogtext dotted;
 }