Bug 1177161 - Shift "More Information" button to the bottom when expanding a subview r=Gijs
authorTim Taubert <ttaubert@mozilla.com>
Wed, 24 Jun 2015 12:38:19 -0700
changeset 250181 832cef9745600af087abde7492daac9817f2117a
parent 250180 f26ddcd80269b3632d0fa646161a30bbacf6e3e7
child 250182 edda2b44b087238cadd4af6908c71b4aa38dfc26
push id61471
push usercbook@mozilla.com
push dateThu, 25 Jun 2015 09:33:34 +0000
treeherdermozilla-inbound@5b38df79819f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1177161
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1177161 - Shift "More Information" button to the bottom when expanding a subview r=Gijs
browser/components/controlcenter/content/panel.inc.xul
browser/themes/shared/controlcenter/panel.inc.css
--- a/browser/components/controlcenter/content/panel.inc.xul
+++ b/browser/components/controlcenter/content/panel.inc.xul
@@ -12,17 +12,17 @@
        level="top">
 
   <broadcasterset>
     <broadcaster id="identity-popup-content-host" value=""/>
   </broadcasterset>
 
   <panelmultiview id="identity-popup-multiView"
                   mainViewId="identity-popup-mainView">
-    <panelview id="identity-popup-mainView">
+    <panelview id="identity-popup-mainView" flex="1">
 
       <!-- Security Section -->
       <hbox class="identity-popup-section">
         <vbox id="identity-popup-security-content" flex="1">
           <label class="identity-popup-headline" crop="end">
             <observes element="identity-popup-content-host" attribute="value"/>
           </label>
           <label class="identity-popup-connection-secure identity-popup-text"
@@ -40,16 +40,18 @@
       <hbox id="identity-popup-permissions" class="identity-popup-section">
         <vbox id="identity-popup-permissions-content" flex="1">
           <label class="identity-popup-text 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>
 
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -10,17 +10,18 @@
 #identity-popup-security-content.unknownIdentity:not(.mixedContent) + .identity-popup-expander,
 #identity-popup-security-content:not(.chromeUI) > .identity-popup-connection-internal,
 #identity-popup-security-content.chromeUI + .identity-popup-expander {
   display: none;
 }
 
 /* PANEL */
 
-#identity-popup {
+#identity-popup,
+.panel-viewstack[viewtype="main"] > .panel-mainview[panelid=identity-popup] > #identity-popup-mainView {
   /* Tiny hack to ensure the panel shrinks back to its original
      size after closing a subview that is bigger than the main view. */
   max-height: 0;
 }
 
 #identity-popup > .panel-arrowcontainer > .panel-arrowcontent {
   padding: 0;
 }