Bug 1196053 - [Control Center] More Information button should be in the subpanel. r=jaws ui-r=shorlander

--HG--
extra : rebase_source : b42c0215678945efa209303bbfa6e78b3f34818f

browser/components/controlcenter/content/panel.inc.xul

@@ -88,15 +88,6 @@
           <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 -->
@@ -131,6 +122,10 @@
         <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>
@@ -159,6 +154,7 @@
                 accesskey="&identity.enableMixedContentBlocking.accesskey;"
                 oncommand="gIdentityHandler.enableMixedContentProtection()"/>
       </vbox>
+
     </panelview>
   </panelmultiview>
 </panel>

browser/themes/linux/controlcenter/panel.css

@@ -4,12 +4,10 @@
 
 %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;
 }

browser/themes/osx/controlcenter/panel.css

@@ -9,13 +9,11 @@
   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@
 }
 

browser/themes/shared/controlcenter/panel.inc.css

@@ -296,36 +296,3 @@ description#identity-popup-content-verifier,
   -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;
-}

browser/themes/windows/controlcenter/panel.css

@@ -4,12 +4,10 @@
 
 %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;
 }