Bug 1247900: Sideloaded add-ons page displays poorly when the restart message is too long for a single line. r=rhelmer
authorDave Townsend <dtownsend@oxymoronical.com>
Wed, 24 Feb 2016 08:46:41 -0800
changeset 324073 a93848ae81dda184b7583759dde71ce653f25d93
parent 324072 2f513fdef55943e338931c9ef2a0c46f4f9cbef9
child 324074 56a3831fbb50897c7b111b046f04f1bdb643877d
push id1128
push userjlund@mozilla.com
push dateWed, 01 Jun 2016 01:31:59 +0000
treeherdermozilla-release@fe0d30de989d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrhelmer
bugs1247900
milestone47.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 1247900: Sideloaded add-ons page displays poorly when the restart message is too long for a single line. r=rhelmer MozReview-Commit-ID: K4afnOIcod6
toolkit/mozapps/extensions/content/newaddon.xul
toolkit/themes/shared/extensions/newaddon.inc.css
--- a/toolkit/mozapps/extensions/content/newaddon.xul
+++ b/toolkit/mozapps/extensions/content/newaddon.xul
@@ -47,20 +47,21 @@
       <checkbox id="allow" label="&allow;"/>
       <description id="later">&later;</description>
 
       <deck id="buttonDeck">
         <hbox id="continuePanel">
           <button id="continue-button" label="&continue;"
                   oncommand="continueClicked()"/>
         </hbox>
-        <hbox id="restartPanel">
-          <spacer id="restartSpacer"/>
-          <description id="restartMessage" flex="1">&restartMessage;</description>
-          <button id="restart-button" label="&restartButton;" oncommand="restartClicked()"/>
-          <button id="cancel-button" label="&cancelButton;" oncommand="cancelClicked()"/>
-        </hbox>
+        <vbox id="restartPanel">
+          <description id="restartMessage">&restartMessage;</description>
+          <hbox id="restartPanelButtons">
+            <button id="restart-button" label="&restartButton;" oncommand="restartClicked()"/>
+            <button id="cancel-button" label="&cancelButton;" oncommand="cancelClicked()"/>
+          </hbox>
+        </vbox>
       </deck>
     </vbox>
 
     <spacer id="spacer-end"/>
   </scrollbox>
 </page>
--- a/toolkit/themes/shared/extensions/newaddon.inc.css
+++ b/toolkit/themes/shared/extensions/newaddon.inc.css
@@ -84,30 +84,32 @@
   -moz-margin-end: 5px;
 }
 
 #allow {
   -moz-margin-start: 84px;
   margin-bottom: 20px;
 }
 
-#continuePanel,
-#restartPanel {
+#buttonDeck {
   margin-top: 25px;
-  -moz-box-pack: end;
-  -moz-box-align: center;
+  -moz-box-align: stretch;
+  -moz-box-pack: stretch;
 }
 
 #continuePanel {
   -moz-box-pack: end;
+  -moz-box-align: end;
 }
 
-#restartMessage {
-  text-align: right;
+#restartPanel {
+  -moz-box-pack: end;
+  -moz-box-align: stretch;
 }
 
-#restartSpacer {
-  -moz-box-flex: 1;
+#restartPanelButtons {
+  margin-top: 25px;
+  -moz-box-pack: end;
 }
 
 #later {
   color: GrayText;
 }