Bug 667252 - Autoconfig wizard: fix order of buttons on Windows, plus make all button text the same size. ui-r+r=bwinton
authorSiddharth Agarwal <sid.bugzilla@gmail.com>
Wed, 13 Jul 2011 16:51:04 -0700
changeset 8119 45a849aee616
parent 8118 e42ccacdc80a
child 8120 38876eeaef86
push id6239
push usersid.bugzilla@gmail.com
push dateThu, 14 Jul 2011 21:33:27 +0000
treeherdercomm-central@38876eeaef86 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs667252
Bug 667252 - Autoconfig wizard: fix order of buttons on Windows, plus make all button text the same size. ui-r+r=bwinton
mail/themes/gnomestripe/mail/accountCreation.css
mail/themes/pinstripe/mail/accountCreation.css
mail/themes/qute/mail/accountCreation.css
mailnews/base/prefs/content/accountcreation/emailWizard.xul
--- a/mail/themes/gnomestripe/mail/accountCreation.css
+++ b/mail/themes/gnomestripe/mail/accountCreation.css
@@ -1,25 +1,12 @@
 /* ::::: BUTTONS ::::: */
 
-.larger-button {
-  font-size: 1.1em;
-}
-
-.smaller-button {
-  font-size: 0.85em;
-}
-
-#back_button {
-  border: none;
-  -moz-appearance: none;
-  color: -moz-nativehyperlinktext;
-  text-decoration: underline;
-  background-color: inherit;
-  cursor: pointer;
+.important-button {
+  font-weight: bold;
 }
 
 .errordescription {
   background-color: InfoBackground;
   border-radius: 4px;
   margin-top: 3px;
   -moz-padding-start: 3px;
 }
--- a/mail/themes/pinstripe/mail/accountCreation.css
+++ b/mail/themes/pinstripe/mail/accountCreation.css
@@ -1,22 +1,12 @@
 /* Missing:
- * .larger-button
- * .smaller-button
+ * .important-button
  */
 
-#back_button {
-  border: none;
-  -moz-appearance: none;
-  color: -moz-nativehyperlinktext;
-  text-decoration: underline;
-  background-color: inherit;
-  cursor: pointer;
-}
-
 .errordescription {
   -moz-padding-start: 3px;
   margin-top: 3px;
 }
 
 .initialDesc, .columnHeader {
   margin-top: 2px;
   color: GrayText;
--- a/mail/themes/qute/mail/accountCreation.css
+++ b/mail/themes/qute/mail/accountCreation.css
@@ -1,25 +1,23 @@
 /* ::::: BUTTONS ::::: */
 
-.larger-button {
-  font-size: 1.1em;
+.important-button {
+  font-weight: bold;
 }
 
-.smaller-button {
-  font-size: 0.85em;
+/* Set the order of the buttons to: (stop|re-test), (continue|create account), cancel */
+#stop_button, #half-manual-test_button {
+  -moz-box-ordinal-group: 1;
 }
-
-#back_button {
-  border: none;
-  -moz-appearance: none;
-  color: -moz-nativehyperlinktext;
-  text-decoration: underline;
-  background-color: inherit;
-  cursor: pointer;
+#next_button, #create_button {
+  -moz-box-ordinal-group: 2;
+}
+#cancel_button {
+  -moz-box-ordinal-group: 3;
 }
 
 .errordescription {
   -moz-padding-start: 3px;
   margin-top: 3px;
 }
 
 .initialDesc, .columnHeader {
--- a/mailnews/base/prefs/content/accountcreation/emailWizard.xul
+++ b/mailnews/base/prefs/content/accountcreation/emailWizard.xul
@@ -380,56 +380,50 @@
     </groupbox>
 
     <spacer flex="1" />
     <hbox id="buttons_area">
       <hbox id="left_buttons_area" align="center" pack="start">
         <button id="manual-edit_button"
                 label="&manual-edit.label;"
                 accesskey="&manual-edit.accesskey;"
-                class="smaller-button"
                 hidden="true"
                 oncommand="gEmailConfigWizard.onManualEdit();"/>
         <button id="advanced-setup_button"
                 label="&advancedSetup.label;"
                 accesskey="&advancedSetup.accesskey;"
-                class="smaller-button"
                 disabled="true"
                 hidden="true"
                 oncommand="gEmailConfigWizard.onAdvancedSetup();"/>
       </hbox>
       <spacer flex="1"/>
       <hbox id="right_buttons_area" align="center" pack="end">
         <button id="stop_button"
                 label="&stop.label;"
                 accesskey="&stop.accesskey;"
-                class="smaller-button"
                 hidden="true"
                 oncommand="gEmailConfigWizard.onStop();"/>
         <button id="cancel_button"
                 label="&cancel.label;"
-                class="smaller-button"
                 accesskey="&cancel.accesskey;"
                 oncommand="gEmailConfigWizard.onCancel();"/>
         <button id="half-manual-test_button"
                 label="&half-manual-test.label;"
                 accesskey="&half-manual-test.accesskey;"
-                class="larger-button"
                 hidden="true"
                 oncommand="gEmailConfigWizard.onHalfManualTest();"/>
         <button id="next_button"
                 label="&continue.label;"
                 accesskey="&continue.accesskey;"
-                class="larger-button"
                 hidden="false"
                 oncommand="gEmailConfigWizard.onNext();"/>
         <button id="create_button"
                 label="&createAccount.label;"
                 accesskey="&createAccount.accesskey;"
-                class="larger-button"
+                class="important-button"
                 hidden="true"
                 oncommand="gEmailConfigWizard.onCreate();"/>
       </hbox>
     </hbox>
   </vbox>
 
 
   <vbox id="warningbox" hidden="true" flex="1">