Bug 1324754 - Fix the paddings in EmailWizard. r=aceman a=jorgk
authorRichard Marti <richard.marti@gmail.com>
Fri, 10 Feb 2017 17:55:12 +0100
changeset 27748 aa29cfd313a6e89550874cadc4b8e703a96fd9ac
parent 27747 3fb4ed134a2ee8ecddb77fc9feb790a42bc739ae
child 27749 fe3301a68e98c555ea25c304c20cd156e48e6b5f
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaceman, jorgk
bugs1324754
Bug 1324754 - Fix the paddings in EmailWizard. r=aceman a=jorgk
mail/themes/linux/mail/accountCreation.css
mail/themes/osx/mail/accountCreation.css
mail/themes/windows/mail/accountCreation.css
mailnews/base/prefs/content/accountcreation/emailWizard.xul
--- a/mail/themes/linux/mail/accountCreation.css
+++ b/mail/themes/linux/mail/accountCreation.css
@@ -141,18 +141,16 @@ textbox.port {
 textbox.username {
   width: 12em;
   margin-bottom: 4px !important;
   margin-top: 4px !important;
 }
 
 .host {
   width: 12em;
-  margin-bottom: 4px !important;
-  margin-top: 4px !important;
 }
 
 .technical_details {
   cursor: pointer;
   margin: 0px;
   padding-left: 20px;
   background: url("chrome://messenger/skin/section_collapsed.png") left 0 no-repeat;
 }
@@ -173,16 +171,34 @@ textbox[disabled="true"],
 input[disabled="true"],
 menulist[disabled="true"] {
   -moz-appearance: none;
   border: 0;
   background-color: -moz-dialog;
   color: -moz-DialogText;
 }
 
+menulist:not([editable="true"]) {
+  padding-top: 2px;
+  padding-bottom: 3px;
+}
+
+.menulist-editable-box {
+  -moz-appearance: textfield;
+  min-width: 4em;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  padding-inline-start: 4px;
+  padding-inline-end: 2px;
+}
+
+menulist > .menulist-editable-input {
+  padding-right: 1px !important;
+  padding-left: 1px !important;
+}
 
 /* status area */
 
 #status_area {
   -moz-box-pack: center;
 }
 
 #status_area[status=loading] #status_msg {
@@ -209,16 +225,20 @@ menulist[disabled="true"] {
 /* Missing:
  * .menulist-dropmarker[disabled="true"]
  */
 
 textbox.port[disabled="true"] {
   padding-top: 4px;
 }
 
+#outgoing_server_area {
+  padding-top: 2px;
+}
+
 #incoming_protocol[disabled="true"] {
   padding-left: 5px;
 }
 
 #initialSettings, #status_area {
   margin-bottom: 1em;
 }
 #result_area, #result_imappop {
--- a/mail/themes/osx/mail/accountCreation.css
+++ b/mail/themes/osx/mail/accountCreation.css
@@ -139,18 +139,16 @@ textbox.port {
 textbox.username {
   width: 14em;
   margin-bottom: 4px !important;
   margin-top: 4px !important;
 }
 
 .host {
   width: 14em;
-  margin-bottom: 4px !important;
-  margin-top: 4px !important;
 }
 
 /* Missing:
  * textbox[disabled="true"]
  */
 
 .technical_details {
   cursor: pointer;
@@ -175,16 +173,20 @@ textbox[disabled="true"],
 input[disabled="true"],
 menulist[disabled="true"] {
   -moz-appearance: none;
   border: 0;
   background-color: #ececec;
   color: #000000 !important;
 }
 
+menulist {
+  margin-right: 4px;
+  margin-left: 4px;
+}
 
 /* status area */
 
 #status_area[status=loading] #status_msg {
   font-weight: bold;
 }
 
 #status_area[status=error] #status_msg {
--- a/mail/themes/windows/mail/accountCreation.css
+++ b/mail/themes/windows/mail/accountCreation.css
@@ -159,16 +159,19 @@ textbox.port {
 textbox.username {
   width: 12em;
   margin-bottom: 4px !important;
   margin-top: 4px !important;
 }
 
 .host {
   width: 12em;
+}
+
+.outgoing_hostname {
   margin-bottom: 4px !important;
   margin-top: 4px !important;
 }
 
 .technical_details {
   cursor: pointer;
   margin: 0px;
   padding-left: 20px;
@@ -195,16 +198,34 @@ menulist[disabled="true"] {
   background-color: -moz-dialog;
   color: -moz-DialogText;
 }
 
 textbox.padded html|*.textbox-input::placeholder {
   font-style: normal;
 }
 
+.textbox-input-box {
+  padding-top: 2px;
+  padding-bottom: 1px;
+}
+
+.menulist-editable-box {
+  padding-top: 4px;
+  padding-bottom: 4px;
+  padding-inline-start: 5px;
+}
+
+@media (-moz-windows-default-theme: 0) {
+  .menulist-label-box {
+    padding-top: 2px;
+    padding-bottom: 2px;
+  }
+}
+
 /* status area */
 
 #status_area[status=loading] #status_msg {
   font-weight: bold;
 }
 
 #status_area[status=error] #status_msg {
   font-weight: bold;
@@ -226,16 +247,20 @@ textbox.padded html|*.textbox-input::pla
 .menulist-dropmarker[disabled="true"] {
   visibility: hidden;
 }
 
 textbox.port[disabled="true"] {
   padding-top: 6px;
 }
 
+#outgoing_server_area {
+  padding-top: 2px;
+}
+
 #incoming_protocol[disabled="true"] {
   padding-left: 6px;
 }
 
 #initialSettings, #status_area {
   margin-bottom: 1em;
 }
 #result_area, #result_imappop {
--- a/mailnews/base/prefs/content/accountcreation/emailWizard.xul
+++ b/mailnews/base/prefs/content/accountcreation/emailWizard.xul
@@ -255,20 +255,22 @@
           <row id="labels_row" align="center">
             <spacer/>
             <spacer/>
             <label value="&hostname.label;" class="columnHeader"/>
             <label value="&port.label;" class="columnHeader"/>
             <label value="&ssl.label;" class="columnHeader"/>
             <label value="&auth.label;" class="columnHeader"/>
           </row>
-          <row id="incoming_server_area" align="center">
-            <label class="textbox-label"
-                   value="&incoming.label;"
-                   control="incoming_hostname"/>
+          <row id="incoming_server_area">
+            <hbox align="center" pack="end">
+              <label class="textbox-label"
+                     value="&incoming.label;"
+                     control="incoming_hostname"/>
+            </hbox>
             <menulist id="incoming_protocol"
                       oncommand="gEmailConfigWizard.onChangedProtocolIncoming();"
                       sizetopopup="always">
               <menupopup>
                 <menuitem label="&imap.label;" value="1"/>
                 <menuitem label="&pop3.label;" value="2"/>
               </menupopup>
             </menulist>