Bug 1609457 - Port bug 981248 - Remove the removed input-number-mozbox class on <input type=number> and add some tweaks to the spinbuttons. r=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Thu, 16 Jan 2020 14:14:53 +0200
changeset 37967 d99c86994ce07a8ab3ab1b1b1f89a494cf15dcd0
parent 37966 dba02c1a5a98bd05b7d93755ab4d2c6fbd5b48ef
child 37968 9019654088aec742a383e1aab843c3b44b280d9e
push id398
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:10:28 +0000
reviewersmkmelin
bugs1609457, 981248
Bug 1609457 - Port bug 981248 - Remove the removed input-number-mozbox class on <input type=number> and add some tweaks to the spinbuttons. r=mkmelin
calendar/base/content/dialogs/calendar-event-dialog-recurrence.xhtml
calendar/base/content/dialogs/calendar-event-dialog-reminder.xhtml
calendar/base/content/preferences/alarms.inc.xhtml
calendar/base/content/preferences/general.inc.xhtml
calendar/base/content/widgets/calendar-alarm-widget.js
calendar/lightning/content/lightning-item-iframe.xhtml
mail/components/addrbook/content/abCard.inc.xhtml
mail/components/compose/content/dialogs/EdHLineProps.xhtml
mail/components/compose/content/dialogs/EdInsertTable.xhtml
mail/components/compose/content/dialogs/EdListProps.xhtml
mail/components/compose/content/dialogs/EdTableProps.xhtml
mail/components/compose/content/dialogs/edImage.inc.xhtml
mail/components/preferences/chat.inc.xhtml
mail/components/preferences/compose.inc.xhtml
mail/components/preferences/connection.xhtml
mail/components/preferences/general.inc.xhtml
mail/components/preferences/notifications.xhtml
mail/themes/linux/jar.mn
mail/themes/linux/mail/preferences/preferences.css
mail/themes/linux/mail/textbox.css
mail/themes/osx/jar.mn
mail/themes/osx/mail/input-fields.css
mail/themes/osx/mail/preferences/preferences.css
mail/themes/osx/mail/textbox.css
mail/themes/shared/mail/incontentprefs/preferences.css
mail/themes/shared/mail/input-fields.css
mail/themes/windows/jar.mn
mail/themes/windows/mail/input-fields.css
mail/themes/windows/mail/preferences/preferences.css
mail/themes/windows/mail/textbox.css
mailnews/addrbook/prefs/content/pref-directory-add.xhtml
mailnews/base/content/folderProps.xhtml
mailnews/base/prefs/content/AccountWizard.xhtml
mailnews/base/prefs/content/SmtpServerEdit.xhtml
mailnews/base/prefs/content/am-junk.xhtml
mailnews/base/prefs/content/am-offline.xhtml
mailnews/base/prefs/content/am-server-advanced.xhtml
mailnews/base/prefs/content/am-server.xhtml
mailnews/base/search/content/searchWidgets.js
mailnews/extensions/newsblog/content/am-newsblog.xhtml
mailnews/extensions/newsblog/content/feed-subscriptions.xhtml
mailnews/news/content/downloadheaders.xhtml
--- a/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xhtml
@@ -75,17 +75,17 @@
             <radiogroup id="daily-group">
               <box id="daily-period-every-box" orient="horizontal" align="center">
                 <radio id="daily-group-every-radio"
                        label="&event.recurrence.pattern.every.label;"
                        disable-on-readonly="true"
                        disable-on-occurrence="true"
                        selected="true"/>
                 <html:input id="daily-days" type="number"
-                            class="size3 input-number-mozbox"
+                            class="size3"
                             min="1" max="32767" value="1"
                             oninput="updateRecurrenceControls();"
                             disable-on-readonly="true"
                             disable-on-occurrence="true"/>
                 <label id="daily-group-every-units-label"
                        value="&repeat.units.days.both;"
                        disable-on-readonly="true"
                        disable-on-occurrence="true"/>
@@ -101,17 +101,17 @@
           <vbox id="period-deck-weekly-box">
             <hbox id="weekly-period-every-box" align="center">
               <label id="weekly-period-every-label"
                      value="&event.recurrence.pattern.weekly.every.label;"
                      disable-on-readonly="true"
                      disable-on-occurrence="true"
                      control="weekly-weeks"/>
               <html:input id="weekly-weeks" type="number"
-                          class="size3 input-number-mozbox"
+                          class="size3"
                           min="1" max="32767" value="1"
                           oninput="updateRecurrenceControls();"
                           disable-on-readonly="true"
                           disable-on-occurrence="true"/>
               <label id="weekly-period-units-label"
                      value="&repeat.units.weeks.both;"
                      disable-on-readonly="true"
                      disable-on-occurrence="true"/>
@@ -143,17 +143,17 @@
           <vbox id="period-deck-monthly-box">
             <hbox id="montly-period-every-box" align="center">
               <label id="monthly-period-every-label"
                      value="&event.recurrence.pattern.monthly.every.label;"
                      disable-on-readonly="true"
                      disable-on-occurrence="true"
                      control="monthly-interval"/>
               <html:input id="monthly-interval" type="number"
-                          class="size3 input-number-mozbox"
+                          class="size3"
                           min="1" max="32767" value="1"
                           oninput="updateRecurrenceControls();"
                           disable-on-readonly="true"
                           disable-on-occurrence="true"/>
               <label id="monthly-period-units-label"
                      value="&repeat.units.months.both;"
                      disable-on-readonly="true"
                      disable-on-occurrence="true"/>
@@ -290,17 +290,17 @@
           <box id="period-deck-yearly-box"
                orient="vertical"
                align="start">
             <hbox id="yearly-period-every-box" align="center">
               <label id="yearly-period-every-label"
                      value="&event.recurrence.every.label;"
                      control="yearly-interval"/>
               <html:input id="yearly-interval" type="number"
-                          class="size3 input-number-mozbox"
+                          class="size3"
                           min="1" max="32767" value="1"
                           oninput="updateRecurrenceControls();"
                           disable-on-readonly="true"
                           disable-on-occurrence="true"/>
               <label id="yearly-period-units-label" value="&repeat.units.years.both;"/>
             </hbox>
             <radiogroup id="yearly-group">
               <vbox>
@@ -309,17 +309,17 @@
                          label="&event.recurrence.pattern.yearly.every.month.label;"
                          selected="true"
                          disable-on-readonly="true"
                          disable-on-occurrence="true"/>
                   <box id="yearly-period-absolute-controls"
                        orient="horizontal"
                        align="center">
                     <html:input id="yearly-days" type="number"
-                                class="size3 input-number-mozbox"
+                                class="size3"
                                 min="1" value="1"
                                 oninput="updateRecurrenceControls();"
                                 disable-on-readonly="true"
                                 disable-on-occurrence="true"/>
                     <label id="yearly-period-of-month-label"
                            value="&event.recurrence.pattern.yearly.of.label;"
                            control="yearly-month-ordinal"/>
                     <menulist id="yearly-month-ordinal"
@@ -510,17 +510,17 @@
              orient="horizontal"
              align="center">
           <radio id="recurrence-range-for"
                  label="&event.recurrence.repeat.for.label;"
                  value="ntimes"
                  disable-on-readonly="true"
                  disable-on-occurrence="true"/>
           <html:input id="repeat-ntimes-count" type="number"
-                      class="size3 input-number-mozbox"
+                      class="size3"
                       min="1" max="32767" value="5"
                       oninput="updateRecurrenceControls();"
                       disable-on-readonly="true"
                       disable-on-occurrence="true"/>
           <label id="repeat-appointments-label"
                  value="&event.recurrence.appointments.label;"
                  disable-on-readonly="true"
                  disable-on-occurrence="true"/>
--- a/calendar/base/content/dialogs/calendar-event-dialog-reminder.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-reminder.xhtml
@@ -56,18 +56,17 @@
   <radiogroup id="reminder-relation-radiogroup"
                 onselect="setupRadioEnabledState(); updateReminder(event)">
     <hbox id="reminder-relative-box" align="start" flex="1">
       <radio id="reminder-relative-radio"
              value="relative"
              aria-labelledby="reminder-length reminder-unit reminder-relation-origin"/>
       <vbox id="reminder-relative-box" flex="1">
         <hbox id="reminder-relative-length-unit-relation" flex="1">
-          <html:input id="reminder-length" type="number"
-                      class="input-number-mozbox" min="0"
+          <html:input id="reminder-length" type="number" min="0"
                       oninput="updateReminder(event)"/>
           <menulist id="reminder-unit" oncommand="updateReminder(event)" flex="1">
             <menupopup id="reminder-unit-menupopup">
               <menuitem id="reminder-minutes-menuitem"
                         label="&alarm.units.minutes;"
                         value="minutes"/>
               <menuitem id="reminder-hours-menuitem"
                         label="&alarm.units.hours;"
--- a/calendar/base/content/preferences/alarms.inc.xhtml
+++ b/calendar/base/content/preferences/alarms.inc.xhtml
@@ -62,17 +62,17 @@
     </groupbox>
 
     <groupbox data-category="paneCalendar">
         <label><html:h2>&pref.calendar.alarms.defaults.label;</html:h2></label>
         <hbox align="center">
             <label value="&pref.defaultsnoozelength.label;"
                    accesskey="&pref.defaultsnoozelength.accesskey;"
                    control="defaultsnoozelength"/>
-            <html:input id="defaultsnoozelength" type="number" class="size3 input-number-mozbox"
+            <html:input id="defaultsnoozelength" type="number" class="size3"
                         min="0"
                         preference="calendar.alarms.defaultsnoozelength"
                         onselect="updateUnitLabelPlural('defaultsnoozelength', 'defaultsnoozelengthunit', 'minutes')"
                         oninput="updateUnitLabelPlural('defaultsnoozelength', 'defaultsnoozelengthunit', 'minutes')"/>
             <label id="defaultsnoozelengthunit"/>
         </hbox>
         <hbox>
             <html:table id="alarm-defaults-table">
@@ -125,17 +125,17 @@
                         <label value="&pref.defalarmlen4events.label;"
                                accesskey="&pref.defalarmlen4events.accesskey;"
                                control="eventdefalarmlen"/>
                     </html:td>
                     <html:td>
                         <hbox class="defaultTimeBox"
                               align="center"
                               flex="1">
-                            <html:input id="eventdefalarmlen" type="number" class="size3 input-number-mozbox" min="0"
+                            <html:input id="eventdefalarmlen" type="number" class="size3" min="0"
                                         preference="calendar.alarms.eventalarmlen"
                                         onselect="updateMenuLabelsPlural('eventdefalarmlen', 'eventdefalarmunit')"
                                         oninput="updateMenuLabelsPlural('eventdefalarmlen', 'eventdefalarmunit')"/>
                             <menulist id="eventdefalarmunit"
                                       flex="1"
                                       crop="none"
                                       preference="calendar.alarms.eventalarmunit">
                                 <menupopup id="eventdefalarmunitpopup">
@@ -156,17 +156,17 @@
                         <label value="&pref.defalarmlen4todos.label;"
                                accesskey="&pref.defalarmlen4todos.accesskey;"
                                control="tododefalarmlen"/>
                     </html:td>
                     <html:td>
                         <hbox class="defaultTimeBox"
                               align="center"
                               flex="1">
-                            <html:input id="tododefalarmlen" type="number" class="size3 input-number-mozbox" min="0"
+                            <html:input id="tododefalarmlen" type="number" class="size3" min="0"
                                         preference="calendar.alarms.todoalarmlen"
                                         onselect="updateMenuLabelsPlural('tododefalarmlen', 'tododefalarmunit')"
                                         oninput="updateMenuLabelsPlural('tododefalarmlen', 'tododefalarmunit')"/>
                             <menulist id="tododefalarmunit"
                                       flex="1"
                                       crop="none"
                                       preference="calendar.alarms.todoalarmunit">
                                 <menupopup id="tododefalarmunitpopup">
--- a/calendar/base/content/preferences/general.inc.xhtml
+++ b/calendar/base/content/preferences/general.inc.xhtml
@@ -29,17 +29,17 @@
         <label><html:h2 id="defaults-itemtype-caption">&pref.eventsandtasks.label;</html:h2></label>
         <vbox id="defaults-itemtype-box">
             <hbox id="defaults-event-grid-box" align="center">
                 <label id="default-event-length-label"
                         value="&pref.default_event_task_length.label;"
                         accesskey="&pref.default_event_task_length.accesskey;"
                         control="defaultlength"/>
                 <html:input id="defaultlength" type="number"
-                            class="size3 input-number-mozbox"
+                            class="size3"
                             min="0"
                             preference="calendar.event.defaultlength"
                             onselect="updateUnitLabelPlural('defaultlength', 'defaultlengthunit', 'minutes')"
                             oninput="updateUnitLabelPlural('defaultlength', 'defaultlengthunit', 'minutes')"/>
                 <label id="defaultlengthunit"/>
             </hbox>
             <html:table id="defaults-task-table">
                 <html:tr id="defaults-task-start-row">
@@ -74,17 +74,17 @@
                                           label="&pref.default_task_offset_next_hour.label;"
                                           value="offsetnexthour"/>
                             </menupopup>
                         </menulist>
                     </html:td>
                     <html:td>
                         <hbox id="default_task_start_offset" align="center">
                             <html:input id="default_task_start_offset_text" type="number"
-                                        class="size3 input-number-mozbox"
+                                        class="size3"
                                         min="0"
                                         preference="calendar.task.defaultstartoffset"
                                         onselect="updateMenuLabelsPlural('default_task_start_offset_text', 'default_task_start_offset_units')"
                                         oninput="updateMenuLabelsPlural('default_task_start_offset_text', 'default_task_start_offset_units')"/>
                             <menulist id="default_task_start_offset_units"
                                       crop="none"
                                       preference="calendar.task.defaultstartoffsetunits">
                                 <menupopup id="default_task_start_offset_units_popup">
@@ -132,17 +132,17 @@
                                           label="&pref.default_task_offset_next_hour.label;"
                                           value="offsetnexthour"/>
                             </menupopup>
                         </menulist>
                     </html:td>
                     <html:td>
                         <hbox id="default_task_due_offset" align="center">
                             <html:input id="default_task_due_offset_text" type="number"
-                                        class="size3 input-number-mozbox"
+                                        class="size3"
                                         min="0"
                                         preference="calendar.task.defaultdueoffset"
                                         onselect="updateMenuLabelsPlural('default_task_due_offset_text', 'default_task_due_offset_units')"
                                         oninput="updateMenuLabelsPlural('default_task_due_offset_text', 'default_task_due_offset_units')"/>
                             <menulist id="default_task_due_offset_units"
                                       crop="none"
                                       preference="calendar.task.defaultdueoffsetunits">
                                 <menupopup id="default_task_due_offset_units_popup">
--- a/calendar/base/content/widgets/calendar-alarm-widget.js
+++ b/calendar/base/content/widgets/calendar-alarm-widget.js
@@ -253,17 +253,17 @@
                     value="120"
                     oncommand="snoozeItem(event)"/>
           <menuitem label="&calendar.alarm.snooze.1day.label;"
                     value="1440"
                     oncommand="snoozeItem(event)"/>
           <menuseparator/>
           <hbox class="snooze-options-box">
             <html:input type="number"
-                        class="size3 input-number-mozbox snooze-value-textbox"
+                        class="size3 snooze-value-textbox"
                         oninput="updateUIText()"
                         onselect="updateUIText()"/>
             <menulist class="snooze-unit-menulist" allowevents="true">
               <menupopup class="snooze-unit-menupopup menulist-menupopup"
                          position="after_start"
                          ignorekeys="true">
                 <menuitem closemenu="single" class="unit-menuitem" value="1"></menuitem>
                 <menuitem closemenu="single" class="unit-menuitem" value="60"></menuitem>
--- a/calendar/lightning/content/lightning-item-iframe.xhtml
+++ b/calendar/lightning/content/lightning-item-iframe.xhtml
@@ -369,17 +369,17 @@
           </menulist>
           <datepicker id="completed-date-picker"
                       class="todo-only"
                       disable-on-readonly="true"
                       disabled="true"
                       value=""/>
           <html:input id="percent-complete-textbox"
                       type="number"
-                      class="size3 input-inline input-number-mozbox"
+                      class="size3 input-inline"
                       min="0"
                       max="100"
                       disable-on-readonly="true"
                       oninput="updateToDoStatus('percent-changed')"
                       onselect="updateToDoStatus('percent-changed')"/>
           <label id="percent-complete-label"
                  class="todo-only"
                  disable-on-readonly="true"
--- a/mail/components/addrbook/content/abCard.inc.xhtml
+++ b/mail/components/addrbook/content/abCard.inc.xhtml
@@ -345,24 +345,24 @@
               <menupopup>
                 <menuitem label="&Day.placeholder;" value="-1" class="placeholderOption"/>
               </menupopup>
             </menulist>
             <html:input id="BirthYear"
                         type="number"
                         maxlength="4"
                         placeholder="&Year.placeholder;"
-                        class="YearWidth input-inline input-number-mozbox"/>
+                        class="YearWidth input-inline"/>
             <label control="Age" value="&Age.label;"/>
             <html:input id="Age"
                         type="number"
                         min="0"
                         maxlength="4"
                         placeholder="&Age.placeholder;"
-                        class="YearWidth input-inline input-number-mozbox"/>
+                        class="YearWidth input-inline"/>
             <spacer flex="1"/>
           </hbox>
         </hbox>
       </vbox>
 
       <!-- ** Business Address Tab ** -->
       <vbox id="abBusinessTab" >
         <hbox id="JobTitleDepartmentContainer" align="center">
--- a/mail/components/compose/content/dialogs/EdHLineProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdHLineProps.xhtml
@@ -39,33 +39,33 @@
         <html:th>
           <label id="widthLabel"
                  control="width"
                  value="&widthEditField.label;"
                  accesskey="&widthEditField.accessKey;"/>
         </html:th>
         <html:td>
           <html:input id="width" type="number"
-                      class="narrow input-inline input-number-mozbox"
+                      class="narrow input-inline"
                       aria-labelledby="widthLabel"/>
         </html:td>
         <html:td>
           <menulist id="pixelOrPercentMenulist"/>
         </html:td>
       </html:tr>
       <html:tr>
         <html:th>
           <label id="heightLabel"
                  control="height"
                  value="&heightEditField.label;"
                  accesskey="&heightEditField.accessKey;"/>
         </html:th>
         <html:td>
           <html:input id="height" type="number"
-                      class="narrow input-inline input-number-mozbox"
+                      class="narrow input-inline"
                       aria-labelledby="heightLabel"/>
         </html:td>
         <html:td>
           <label value="&pixelsPopup.value;"/>
         </html:td>
       </html:tr>
     </html:table>
     <checkbox id="3dShading" label="&threeDShading.label;" accesskey="&threeDShading.accessKey;"/>
--- a/mail/components/compose/content/dialogs/EdInsertTable.xhtml
+++ b/mail/components/compose/content/dialogs/EdInsertTable.xhtml
@@ -33,58 +33,58 @@
       <html:tr>
         <html:th>
           <label control="rowsInput"
                  value="&numRowsEditField.label;"
                  accesskey="&numRowsEditField.accessKey;"/>
         </html:th>
         <html:td>
           <html:input id="rowsInput" type="number"
-                      class="narrow input-number-mozbox"
+                      class="narrow"
                       oninput="ChangeRowOrColumn(this.id)"/>
         </html:td>
       </html:tr>
       <html:tr>
         <html:th>
           <label control="columnsInput"
                  value="&numColumnsEditField.label;"
                  accesskey="&numColumnsEditField.accessKey;"/>
         </html:th>
         <html:td>
           <html:input id="columnsInput" type="number"
-                      class="narrow input-number-mozbox"
+                      class="narrow"
                       oninput="ChangeRowOrColumn(this.id)"/>
         </html:td>
       </html:tr>
       <html:tr>
         <html:th>
           <label control="widthInput"
                  value="&widthEditField.label;"
                  accesskey="&widthEditField.accessKey;"/>
         </html:th>
         <html:td>
           <html:input id="widthInput" type="number"
-                      class="narrow input-number-mozbox"
+                      class="narrow"
                       oninput="forceInteger(this.id)"/>
         </html:td>
         <html:td>
           <menulist id="widthPixelOrPercentMenulist" class="menulist-narrow"/>
         </html:td>
       </html:tr>
     </html:table>
     <spacer class="spacer"/>
   </groupbox>
   <spacer class="spacer"/>
   <hbox align="center">
     <label control="borderInput"
            value="&borderEditField.label;"
            accesskey="&borderEditField.accessKey;"
            tooltiptext="&borderEditField.tooltip;" />
     <html:input id="borderInput" type="number"
-                class="narrow input-number-mozbox"
+                class="narrow"
                 oninput="forceInteger(this.id)" />
     <label value="&pixels.label;"/>
   </hbox>
   <vbox id="AdvancedEdit">
     <hbox flex="1" style="margin-top: 0.2em" align="center">
       <!-- This will right-align the button -->
       <spacer flex="1"/>
       <button id="AdvancedEditButton1" oncommand="onAdvancedEdit()" label="&AdvancedEditButton.label;"
--- a/mail/components/compose/content/dialogs/EdListProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdListProps.xhtml
@@ -53,17 +53,17 @@
     <menulist class="MinWidth10em" id="BulletStyle" oncommand="SelectBulletStyle()">
       <menupopup/>
     </menulist>
     <spacer class="spacer"/>
     <hbox align="center">
       <label id="StartingNumberLabel" control="StartingNumber"
              value="&startingNumber.label;" accesskey="&startingNumber.accessKey;"/>
       <html:input id="StartingNumber" type="number"
-                  class="narrow input-inline input-number-mozbox"
+                  class="narrow input-inline"
                   aria-labelledby="StartingNumberLabel"/>
       <spacer/>
     </hbox>
   </groupbox>
   <radiogroup id="RadioGroup" index="0" persist="index">
     <radio id="ChangeAll"      label="&changeEntireListRadio.label;" accesskey="&changeEntireListRadio.accessKey;"/>
     <radio id="ChangeSelected" label="&changeSelectedRadio.label;"   accesskey="&changeSelectedRadio.accessKey;"/>
   </radiogroup>
--- a/mail/components/compose/content/dialogs/EdTableProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdTableProps.xhtml
@@ -57,45 +57,45 @@
                   </hbox>
                   <hbox align="center" flex="1">
                     <label id="TableColumnsLabel" value="&tableColumns.label;" accesskey="&tableColumns.accessKey;"
                            control="TableColumnsInput"/>
                   </hbox>
                 </vbox>
                 <vbox>
                   <html:input id="TableRowsInput" type="number"
-                              class="narrow input-inline input-number-mozbox"
+                              class="narrow input-inline"
                               aria-labelledby="TableRowsLabel"/>
                   <html:input id="TableColumnsInput" type="number"
-                              class="narrow input-inline input-number-mozbox"
+                              class="narrow input-inline"
                               aria-labelledby="TableColumnsLabel"/>
                 </vbox>
               </hbox>
             </vbox>
             <vbox>
               <html:div class="grid-three-column">
                 <html:div class="flex-items-center">
                   <label id="TableHeightLabel" value="&tableHeight.label;"
                          accesskey="&tableHeight.accessKey;" control="TableHeightInput"/>
                 </html:div>
                 <html:div>
                   <html:input id="TableHeightInput" type="number"
-                              class="narrow input-inline input-number-mozbox"
+                              class="narrow input-inline"
                               aria-labelledby="TableHeightLabel"/>
                 </html:div>
                 <html:div class="flex-items-center">
                   <menulist id="TableHeightUnits"/>
                 </html:div>
                 <html:div class="flex-items-center">
                   <label id="TableWidthLabel" value="&tableWidth.label;"
                          accesskey="&tableWidth.accessKey;" control="TableWidthInput"/>
                 </html:div>
                 <html:div>
                   <html:input id="TableWidthInput" type="number"
-                              class="narrow input-inline input-number-mozbox"
+                              class="narrow input-inline"
                               aria-labelledby="TableWidthLabel"/>
                 </html:div>
                 <html:div class="flex-items-center">
                   <menulist id="TableWidthUnits"/>
                 </html:div>
               </html:div>
             </vbox>
           </hbox>
@@ -122,23 +122,23 @@
                 <label id="PaddingLabel"
                        control="PaddingInput"
                        value="&tablePadding.label;"
                        accesskey="&tablePadding.accessKey;"/>
               </hbox>
             </vbox>
             <vbox>
               <html:input id="BorderWidthInput" type="number"
-                          class="narrow input-inline input-number-mozbox"
+                          class="narrow input-inline"
                           aria-labelledby="BorderWidthLabel"/>
               <html:input id="SpacingInput" type="number"
-                          class="narrow input-inline input-number-mozbox"
+                          class="narrow input-inline"
                           aria-labelledby="SpacingLabel"/>
               <html:input id="PaddingInput" type="number"
-                          class="narrow input-inline input-number-mozbox"
+                          class="narrow input-inline"
                           aria-labelledby="PaddingLabel"/>
             </vbox>
             <vbox>
               <hbox flex="1" align="center">
                 <label align="start" value="&pixels.label;"/>
               </hbox>
               <hbox flex="1" align="center">
                 <label value="&tablePxBetwCells.label;"/>
@@ -248,21 +248,21 @@
                   <checkbox id="CellHeightCheckbox" label="&tableHeight.label;" accesskey="&tableHeight.accessKey;"/>
                 </hbox>
                 <hbox flex="1" align="center">
                   <checkbox id="CellWidthCheckbox" label="&tableWidth.label;" accesskey="&tableWidth.accessKey;"/>
                 </hbox>
               </vbox>
               <vbox flex="1">
                 <html:input id="CellHeightInput" type="number"
-                            class="narrow input-inline input-number-mozbox"
+                            class="narrow input-inline"
                             onchange="ChangeIntTextbox('CellHeightCheckbox');"
                             aria-labelledby="CellHeightCheckbox"/>
                 <html:input id="CellWidthInput" type="number"
-                            class="narrow input-inline input-number-mozbox"
+                            class="narrow input-inline"
                             onchange="ChangeIntTextbox('CellWidthCheckbox');"
                             aria-labelledby="CellWidthCheckbox"/>
               </vbox>
               <vbox>
                 <hbox flex="1" align="center">
                   <menulist id="CellHeightUnits" oncommand="SetCheckbox('CellHeightCheckbox');"/>
                 </hbox>
                 <hbox flex="1" align="center">
--- a/mail/components/compose/content/dialogs/edImage.inc.xhtml
+++ b/mail/components/compose/content/dialogs/edImage.inc.xhtml
@@ -115,17 +115,17 @@
               <html:th>
                 <label id="widthLabel"
                        control="widthInput"
                        accesskey="&widthEditField.accessKey;"
                        value="&widthEditField.label;"/>
               </html:th>
               <html:td>
                 <html:input id="widthInput" type="number" min="0"
-                            class="narrow input-inline input-number-mozbox"
+                            class="narrow input-inline"
                             oninput="constrainProportions(this.id,'heightInput')"
                             aria-labelledby="widthLabel"/>
               </html:td>
               <html:td>
                 <menulist id="widthUnitsMenulist"
                           oncommand="doDimensionEnabling();"/>
               </html:td>
             </html:tr>
@@ -133,17 +133,17 @@
               <html:th>
                 <label id="heightLabel"
                        control="heightInput"
                        accesskey="&heightEditField.accessKey;"
                        value="&heightEditField.label;"/>
               </html:th>
               <html:td>
                 <html:input id="heightInput" type="number" min="0"
-                            class="narrow input-inline input-number-mozbox"
+                            class="narrow input-inline"
                             oninput="constrainProportions(this.id,'widthInput')"
                             aria-labelledby="heightLabel"/>
               </html:td>
               <html:td>
                 <menulist id="heightUnitsMenulist"
                           oncommand="doDimensionEnabling();"/>
               </html:td>
             </html:tr>
@@ -163,51 +163,51 @@
                 <label id="leftrightLabel"
                        class="align-right"
                        control="imageleftrightInput"
                        accesskey="&leftRightEditField.accessKey;"
                        value="&leftRightEditField.label;"/>
               </html:th>
               <html:td>
                 <html:input id="imageleftrightInput" type="number" min="0"
-                            class="narrow input-inline input-number-mozbox"
+                            class="narrow input-inline"
                             aria-labelledby="leftrightLabel"/>
               </html:td>
               <html:td id="leftrighttypeLabel">
                 &pixelsPopup.value;
               </html:td>
             </html:tr>
             <html:tr>
               <html:th>
                 <label id="topbottomLabel"
                        class="align-right"
                        control="imagetopbottomInput"
                        accesskey="&topBottomEditField.accessKey;"
                        value="&topBottomEditField.label;"/>
               </html:th>
               <html:td>
                 <html:input id="imagetopbottomInput" type="number" min="0"
-                            class="narrow input-inline input-number-mozbox"
+                            class="narrow input-inline"
                             aria-labelledby="topbottomLabel"/>
               </html:td>
               <html:td id="topbottomtypeLabel">
                 &pixelsPopup.value;
               </html:td>
             </html:tr>
             <html:tr>
               <html:th>
                 <label id="borderLabel"
                        class="align-right"
                        control="border"
                        accesskey="&borderEditField.accessKey;"
                        value="&borderEditField.label;"/>
               </html:th>
               <html:td>
                 <html:input id="border" type="number" min="0"
-                            class="narrow input-inline input-number-mozbox"
+                            class="narrow input-inline"
                             aria-labelledby="borderLabel"/>
               </html:td>
               <html:td id="bordertypeLabel">
                 &pixelsPopup.value;
               </html:td>
             </html:tr>
           </html:table>
         </groupbox>
--- a/mail/components/preferences/chat.inc.xhtml
+++ b/mail/components/preferences/chat.inc.xhtml
@@ -30,17 +30,17 @@
         <separator/>
 
         <!-- Status -->
         <hbox align="center">
           <checkbox id="reportIdle" label="&reportIdleAfter.label;"
                     accesskey="&reportIdleAfter.accesskey;"
                     preference="messenger.status.reportIdle"/>
           <html:input id="timeBeforeAway" type="number"
-                      class="size2 idle-reporting-enabled input-number-mozbox"
+                      class="size2 idle-reporting-enabled"
                       min="1" max="720"
                       preference="messenger.status.timeBeforeIdle"/>
           <label value="&idleTime;" control="timeBeforeAway"/>
         </hbox>
         <vbox class="indent">
           <hbox>
             <checkbox id="autoAway"
                       label="&andSetStatusToAway.label;"
--- a/mail/components/preferences/compose.inc.xhtml
+++ b/mail/components/preferences/compose.inc.xhtml
@@ -30,17 +30,17 @@
                   accesskey="&addExtension.accesskey;"/>
       </hbox>
 
       <separator class="thin"/>
 
       <hbox align="center" pack="start">
         <checkbox id="autoSave" label="&autoSave.label;" preference="mail.compose.autosave"
                   accesskey="&autoSave.accesskey;"/>
-        <html:input id="autoSaveInterval" type="number" class="size2 input-number-mozbox"
+        <html:input id="autoSaveInterval" type="number" class="size2"
                     min="1" max="35790"
                     preference="mail.compose.autosaveinterval"
                     aria-labelledby="autoSave autoSaveInterval autoSaveEnd"/>
         <label id="autoSaveEnd" value="&autoSaveEnd.label;"/>
       </hbox>
       <hbox>
         <checkbox id="mailWarnOnSendAccelKey"
                   label="&warnOnSendAccelKey.label;"
@@ -238,17 +238,17 @@
                 accesskey="&attachmentReminderOptions.accesskey;"
                 oncommand="gComposePane.attachmentReminderOptionsDialog();"/>
       </hbox>
       <vbox id="cloudFileBox" flex="1">
         <hbox id="cloudFileToggleAndThreshold" align="center">
           <checkbox id="enableThreshold"
                     label="&enableCloudFileAccountOffer.label;"
                     preference="mail.compose.big_attachments.notify"/>
-          <html:input id="cloudFileThreshold" type="number" class="size3 input-number-mozbox"
+          <html:input id="cloudFileThreshold" type="number" class="size3"
                       preference="mail.compose.big_attachments.threshold_kb"/>
           <label control="cloudFileThreshold"
                  value="&enableCloudFileAccountOffer.mb;"/>
         </hbox>
         <hbox flex="1" style="height: 480px;">
           <vbox id="provider-listing">
             <richlistbox id="cloudFileView" orient="vertical" flex="1"
                          seltype="single"
--- a/mail/components/preferences/connection.xhtml
+++ b/mail/components/preferences/connection.xhtml
@@ -53,17 +53,17 @@
             <hbox pack="end">
               <label value="&http.label;" accesskey="&http.accesskey;" control="networkProxyHTTP"/>
             </hbox>
             <hbox align="center" class="input-container">
               <html:input id="networkProxyHTTP"
                           type="text"
                           preference="network.proxy.http"/>
               <label value="&HTTPport.label;" accesskey="&HTTPport.accesskey;" control="networkProxyHTTP_Port"/>
-              <html:input id="networkProxyHTTP_Port" type="number" class="size5 input-number-mozbox" max="65535"
+              <html:input id="networkProxyHTTP_Port" type="number" class="size5" max="65535"
                           preference="network.proxy.http_port"/>
             </hbox>
           </row>
           <row>
             <hbox/>
             <hbox>
               <checkbox id="shareAllProxies" label="&proxyHttpSharing.label;" accesskey="&proxyHttpSharing.accesskey;"
                         preference="network.proxy.share_proxy_settings" class="align-no-label"/>
@@ -73,31 +73,31 @@
             <hbox pack="end">
               <label value="&https.label;" accesskey="&https.accesskey;" control="networkProxySSL"/>
             </hbox>
             <hbox align="center" class="input-container">
               <html:input id="networkProxySSL"
                           type="text"
                           preference="network.proxy.ssl"/>
               <label value="&SSLport.label;" accesskey="&SSLport.accesskey;" control="networkProxySSL_Port"/>
-              <html:input id="networkProxySSL_Port" type="number" class="size5 input-number-mozbox" max="65535"
+              <html:input id="networkProxySSL_Port" type="number" class="size5" max="65535"
                           preference="network.proxy.ssl_port"/>
             </hbox>
           </row>
           <separator/>
           <row align="center">
             <hbox pack="end">
               <label value="&socks.label;" accesskey="&socks.accesskey;" control="networkProxySOCKS"/>
             </hbox>
             <hbox align="center" class="input-container">
               <html:input id="networkProxySOCKS"
                           type="text"
                           preference="network.proxy.socks"/>
               <label value="&SOCKSport.label;" accesskey="&SOCKSport.accesskey;" control="networkProxySOCKS_Port"/>
-              <html:input id="networkProxySOCKS_Port" type="number" class="size5 input-number-mozbox" max="65535"
+              <html:input id="networkProxySOCKS_Port" type="number" class="size5" max="65535"
                           preference="network.proxy.socks_port"/>
             </hbox>
           </row>
           <row>
             <spacer/>
             <radiogroup id="networkProxySOCKSVersion"
                         orient="horizontal"
                         class="align-no-label"
--- a/mail/components/preferences/general.inc.xhtml
+++ b/mail/components/preferences/general.inc.xhtml
@@ -450,17 +450,17 @@
           <radio id="mark_read_immediately"
                  label="&markAsReadNoDelay.label;"
                  value="false"
                  accesskey="&markAsReadNoDelay.accesskey;"/>
           <hbox align="center">
             <radio id="markAsReadAfterDelay" value="true"
                    label="&markAsReadDelay.label;"
                    accesskey="&markAsReadDelay.accesskey;"/>
-            <html:input id="markAsReadDelay" type="number" class="size3 input-number-mozbox"
+            <html:input id="markAsReadDelay" type="number" class="size3"
                         min="1" max="2147483"
                         preference="mailnews.mark_message_read.delay.interval"
                         aria-labelledby="markAsReadAfterDelay markAsReadDelay secondsLabel"/>
             <label id="secondsLabel" value="&secondsLabel.label;"/>
           </hbox>
         </radiogroup>
       </vbox>
 
@@ -689,29 +689,29 @@
         <checkbox preference="browser.cache.disk.smart_size.enabled"
                   id="allowSmartSize"
                   label="&overrideSmartCacheSize.label;"
                   accesskey="&overrideSmartCacheSize.accesskey;"/>
       </hbox>
       <hbox align="center" class="indent">
         <label id="useCacheBefore" control="cacheSize"
                accesskey="&useCacheBefore.accesskey;" value="&useCacheBefore.label;"/>
-        <html:input id="cacheSize" type="number" class="size4 input-number-mozbox" max="1024"
+        <html:input id="cacheSize" type="number" class="size4" max="1024"
                     preference="browser.cache.disk.capacity"
                     aria-labelledby="useCacheBefore cacheSize useCacheAfter"/>
         <label id="useCacheAfter" flex="1">&useCacheAfter.label;</label>
       </hbox>
       <hbox align="center">
           <checkbox id="offlineCompactFolder"
                     label="&offlineCompactFolders.label;"
                     accesskey="&offlineCompactFolders.accesskey;"
                     aria-labelledby="offlineCompactFolder offlineCompactFolderMin compactFolderMB"
                     preference="mail.prompt_purge_threshhold"
                     oncommand="gGeneralPane.updateCompactOptions(this.checked);"/>
-          <html:input id="offlineCompactFolderMin" type="number" class="size4 input-number-mozbox"
+          <html:input id="offlineCompactFolderMin" type="number" class="size4"
                       min="1" max="2048" value="200"
                       preference="mail.purge_threshhold_mb"
                       aria-labelledby="offlineCompactFolder offlineCompactFolderMin compactFolderMB"/>
           <label id="compactFolderMB" value="&offlineCompactFoldersMB.label;"/>
       </hbox>
     </groupbox>
 
     <groupbox data-category="paneGeneral">
--- a/mail/components/preferences/notifications.xhtml
+++ b/mail/components/preferences/notifications.xhtml
@@ -26,17 +26,17 @@
 
     <separator/>
     <hbox align="center">
       <label id="totalOpenTimeBefore"
              control="totalOpenTime"
              value="&totalOpenTimeBefore.label;"
              accesskey="&totalOpenTimeBefore.accesskey;"/>
       <html:input id="totalOpenTime" type="number"
-                  class="size3 input-number-mozbox" min="1" max="3600"
+                  class="size3" min="1" max="3600"
                   preference="alerts.totalOpenTime"/>
       <label id="totalOpenTimeEnd" value="&totalOpenTimeEnd.label;"/>
     </hbox>
     <separator/>
   </prefpane>
 
   <script src="chrome://global/content/preferencesBindings.js"/>
   <script src="chrome://messenger/content/preferences/notifications.js"/>
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -26,17 +26,16 @@ classic.jar:
   skin/classic/messenger/section_collapsed.png                (mail/section_collapsed.png)
   skin/classic/messenger/section_expanded.png                 (mail/section_expanded.png)
   skin/classic/messenger/menulist.css                         (mail/menulist.css)
   skin/classic/messenger/messageBody.css                      (mail/messageBody.css)
   skin/classic/messenger/messageHeader.css                    (mail/messageHeader.css)
   skin/classic/messenger/messageIcons.css                     (mail/messageIcons.css)
   skin/classic/messenger/messageQuotes.css                    (mail/messageQuotes.css)
   skin/classic/messenger/messenger.css                        (mail/messenger.css)
-  skin/classic/messenger/textbox.css                          (mail/textbox.css)
   skin/classic/messenger/attachmentList.css                   (mail/attachmentList.css)
   skin/classic/messenger/imageFilters.svg                     (mail/imageFilters.svg)
   skin/classic/messenger/mailWindow1.css                      (mail/mailWindow1.css)
   skin/classic/messenger/messageWindow.css                    (mail/messageWindow.css)
   skin/classic/messenger/searchBox.css                        (mail/searchBox.css)
   skin/classic/messenger/junkMail.css                         (mail/junkMail.css)
   skin/classic/messenger/input-fields.css                     (mail/input-fields.css)
   skin/classic/messenger/folderMenus.css                      (mail/folderMenus.css)
--- a/mail/themes/linux/mail/preferences/preferences.css
+++ b/mail/themes/linux/mail/preferences/preferences.css
@@ -18,26 +18,30 @@ radio[pane] > .radio-label-box {
   /* override the Linux only toolkit rule */
   -moz-appearance: none;
 }
 
 menulist.actionsMenu > .menulist-dropmarker {
   margin-block: 11px;
 }
 
+html|input[type="number"] {
+  min-height: 28px;
+}
+
 html|input[type="number"]::-moz-number-spin-box {
   margin-inline-end: 0;
 }
 
 html|input[type="number"]::-moz-number-spin-up {
-  min-height: 10px;
+  min-height: 12px;
 }
 
 html|input[type="number"]::-moz-number-spin-down {
-  min-height: 11px;
+  min-height: 13px;
 }
 
 .sidebar-footer-label {
   font-size: 1em;
 }
 
 /**
  * Dialog
deleted file mode 100644
--- a/mail/themes/linux/mail/textbox.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-html|input[type="number"]::-moz-number-spin-box {
-  margin-inline-start: 5px;
-}
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -30,17 +30,16 @@ classic.jar:
   skin/classic/messenger/section_collapsed.png                   (mail/section_collapsed.png)
   skin/classic/messenger/section_expanded.png                    (mail/section_expanded.png)
   skin/classic/messenger/menulist.css                            (mail/menulist.css)
   skin/classic/messenger/messageBody.css                         (mail/messageBody.css)
   skin/classic/messenger/messageHeader.css                       (mail/messageHeader.css)
   skin/classic/messenger/messageIcons.css                        (mail/messageIcons.css)
   skin/classic/messenger/messageQuotes.css                       (mail/messageQuotes.css)
   skin/classic/messenger/messageWindow.css                       (mail/messageWindow.css)
-  skin/classic/messenger/textbox.css                             (mail/textbox.css)
   skin/classic/messenger/attachmentList.css                      (mail/attachmentList.css)
   skin/classic/messenger/msgSelectOffline.css                    (mail/msgSelectOffline.css)
   skin/classic/messenger/mailWindow1.css                         (mail/mailWindow1.css)
   skin/classic/messenger/searchBox.css                           (mail/searchBox.css)
   skin/classic/messenger/junkMail.css                            (mail/junkMail.css)
   skin/classic/messenger/input-fields.css                        (mail/input-fields.css)
   skin/classic/messenger/folderMenus.css                         (mail/folderMenus.css)
   skin/classic/messenger/folderPane.css                          (mail/folderPane.css)
--- a/mail/themes/osx/mail/input-fields.css
+++ b/mail/themes/osx/mail/input-fields.css
@@ -8,8 +8,12 @@
 html|input.input-inline {
   padding-inline-start: 4px;
 }
 
 html|input.input-filefield {
   padding: 2px 4px;
   background: center left 2px / 16px no-repeat -moz-field;
 }
+
+html|input[type="number"] {
+  padding-inline-end: 0;
+}
--- a/mail/themes/osx/mail/preferences/preferences.css
+++ b/mail/themes/osx/mail/preferences/preferences.css
@@ -23,16 +23,20 @@ html|h2 {
   padding-bottom: 2px !important;
   padding-inline-start: 0;
 }
 
 groupbox > .groupbox-body {
   padding: 0;
 }
 
+html|input[type="number"] {
+  min-height: 26px;
+}
+
 html|input[type="number"]::-moz-number-spin-up,
 html|input[type="number"]::-moz-number-spin-down {
   min-height: 11px;
 }
 
 menulist:not([popuponly="true"]) {
   min-height: 30px;
 }
deleted file mode 100644
--- a/mail/themes/osx/mail/textbox.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-html|input[type="number"] {
-  padding-inline-end: 0;
-}
-
-html|input[type="number"]::-moz-number-spin-box {
-  margin-inline-start: 3px;
-}
--- a/mail/themes/shared/mail/incontentprefs/preferences.css
+++ b/mail/themes/shared/mail/incontentprefs/preferences.css
@@ -257,17 +257,16 @@ html|input[type="number"].size4 {
   width: calc(4ch + 55px);
 }
 html|input[type="number"].size5 {
   width: calc(5ch + 55px);
 }
 
 html|input[type="number"]::-moz-number-spin-box {
   margin-inline-start: 10px;
-  height: initial;
 }
 
 html|input[type="number"]::-moz-number-spin-up,
 html|input[type="number"]::-moz-number-spin-down {
   -moz-appearance: none;
   min-width: 25px;
   border-color: var(--in-content-box-border-color);
   background-color: var(--in-content-button-background);
--- a/mail/themes/shared/mail/input-fields.css
+++ b/mail/themes/shared/mail/input-fields.css
@@ -53,11 +53,10 @@ html|input.input-inline-color {
 
 html|input[type="number"].input-number-inline {
   flex: 1 !important;
   padding: 2px 2px 3px;
   margin-inline-start: 2px;
 }
 
 html|input[type="number"]::-moz-number-spin-box {
-  height: initial;
-  margin-inline-start: 2px;
+  margin-inline-start: 4px;
 }
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -26,17 +26,16 @@ classic.jar:
   skin/classic/messenger/section_collapsed.png                (mail/section_collapsed.png)
   skin/classic/messenger/section_expanded.png                 (mail/section_expanded.png)
   skin/classic/messenger/menulist.css                         (mail/menulist.css)
   skin/classic/messenger/messageBody.css                      (mail/messageBody.css)
   skin/classic/messenger/messageHeader.css                    (mail/messageHeader.css)
   skin/classic/messenger/messageIcons.css                     (mail/messageIcons.css)
   skin/classic/messenger/messageQuotes.css                    (mail/messageQuotes.css)
   skin/classic/messenger/messenger.css                        (mail/messenger.css)
-  skin/classic/messenger/textbox.css                          (mail/textbox.css)
   skin/classic/messenger/attachmentList.css                   (mail/attachmentList.css)
   skin/classic/messenger/imageFilters.svg                     (mail/imageFilters.svg)
   skin/classic/messenger/mailWindow1.css                      (mail/mailWindow1.css)
   skin/classic/messenger/messageWindow.css                    (mail/messageWindow.css)
   skin/classic/messenger/searchBox.css                        (mail/searchBox.css)
   skin/classic/messenger/junkMail.css                         (mail/junkMail.css)
   skin/classic/messenger/input-fields.css                     (mail/input-fields.css)
   skin/classic/messenger/folderMenus.css                      (mail/folderMenus.css)
--- a/mail/themes/windows/mail/input-fields.css
+++ b/mail/themes/windows/mail/input-fields.css
@@ -8,8 +8,13 @@
 html|input.input-inline {
   padding: 0;
   padding-inline-start: 4px;
 }
 
 html|input.input-filefield {
   background: center left 2px / 16px no-repeat -moz-dialog;
 }
+
+html|input[type="number"]::-moz-number-spin-up,
+html|input[type="number"]::-moz-number-spin-down {
+  min-height: .7em;
+}
--- a/mail/themes/windows/mail/preferences/preferences.css
+++ b/mail/themes/windows/mail/preferences/preferences.css
@@ -17,19 +17,27 @@ radio[pane] > .radio-label-box {
 html|h2 {
   background-color: transparent;
 }
 
 .sidebar-footer-label {
   font-size: 1.125em;
 }
 
+html|input[type="number"] {
+  min-height: 27px;
+}
+
+html|input[type="number"]::-moz-number-spin-box {
+  margin-inline-end: 11px;
+}
+
 html|input[type="number"]::-moz-number-spin-up,
 html|input[type="number"]::-moz-number-spin-down {
-  min-height: 13px;
+  min-height: 12px;
 }
 
 /**
  * Dialog
  */
 
 #dialogTitle {
   font-size: 1.05em;
deleted file mode 100644
--- a/mail/themes/windows/mail/textbox.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-html|input[type="number"]::-moz-number-spin-box {
-  margin-inline-start: 4px;
-}
-
-html|input[type="number"]::-moz-number-spin-up,
-html|input[type="number"]::-moz-number-spin-down {
-  min-height: .7em;
-}
--- a/mailnews/addrbook/prefs/content/pref-directory-add.xhtml
+++ b/mailnews/addrbook/prefs/content/pref-directory-add.xhtml
@@ -77,17 +77,17 @@
                 </div>
                 <div class="flex-items-center">
                   <xul:label id="portLabel" value="&portNumber.label;"
                              accesskey="&portNumber.accesskey;"
                              control="port"/>
                 </div>
                 <div>
                   <input id="port" type="number"
-                         class="size5 input-inline input-number-mozbox"
+                         class="size5 input-inline"
                          min="1" max="65535"
                          aria-labelledby="portLabel"
                          disableiflocked="true"/>
                 </div>
                 <div></div>
                 <div class="flex-items-center">
                   <xul:label id="loginLabel" value="&directoryLogin.label;"
                              accesskey="&directoryLogin.accesskey;"
@@ -120,17 +120,17 @@
             <div xmlns="http://www.w3.org/1999/xhtml" class="grid-two-column">
               <div class="flex-items-center">
                 <xul:label id="returnMaxLabel" value="&return.label;"
                            accesskey="&return.accesskey;"
                            control="results"/>
               </div>
               <div class="flex-items-center">
                 <input id="results" type="number"
-                       class="size5 input-inline input-number-mozbox"
+                       class="size5 input-inline"
                        min="1" max="2147483647" value="100"
                        aria-labelledby="returnMaxLabel"/>
                 <xul:label value="&results.label;"/>
               </div>
               <div class="flex-items-center">
                 <xul:label value="&scope.label;" control="scope"
                            accesskey="&scope.accesskey;"/>
               </div>
--- a/mailnews/base/content/folderProps.xhtml
+++ b/mailnews/base/content/folderProps.xhtml
@@ -112,26 +112,26 @@
           <hbox class="indent">
             <radiogroup wsm_persist="true" id="retention.keepMsg" aria-labelledby="retention.useDefault">
               <radio wsm_persist="true" value="1" accesskey="&retentionKeepAll.accesskey;"
                       label="&retentionKeepAll.label;" oncommand="onCheckKeepMsg();"/>
               <hbox flex="1" align="center">
                 <radio wsm_persist="true" id="keepNewMsg" accesskey="&retentionKeepRecent.accesskey;"
                         value="3" label="&retentionKeepRecent.label;" oncommand="onCheckKeepMsg();"/>
                 <html:input id="retention.keepNewMsgMin" type="number"
-                            class="size4 input-number-mozbox" min="1" value="2000"
+                            class="size4" min="1" value="2000"
                             wsm_persist="true"
                             aria-labelledby="keepNewMsg retention.keepNewMsgMin retention.keepNewMsgMinLabel"/>
                 <label value="&message.label;" control="retention.keepNewMsgMin" id="retention.keepNewMsgMinLabel"/>
               </hbox>
               <hbox flex="1" align="center">
                 <radio wsm_persist="true" id="keepMsg" accesskey="&retentionDeleteMsg.accesskey;"
                         value="2" label="&retentionDeleteMsg.label;" oncommand="onCheckKeepMsg();"/>
                 <html:input id="retention.keepOldMsgMin" type="number"
-                            class="size4 input-number-mozbox" min="1" value="30"
+                            class="size4" min="1" value="30"
                             wsm_persist="true"
                             aria-labelledby="keepMsg retention.keepOldMsgMin retention.keepOldMsgMinLabel"/>
                 <label value="&daysOld.label;" control="retention.keepOldMsgMin" id="retention.keepOldMsgMinLabel"/>
               </hbox>
             </radiogroup>
           </hbox>
           <hbox class="indent">
             <checkbox id="retention.applyToFlagged" wsm_persist="true"
--- a/mailnews/base/prefs/content/AccountWizard.xhtml
+++ b/mailnews/base/prefs/content/AccountWizard.xhtml
@@ -129,17 +129,17 @@
                      wsm_persist="true" oncommand="setServerType();" accesskey="&popType.accesskey;"/>
               <radio id="imap" group="servertype" value="imap" label="&imapType.label;"
                      wsm_persist="true" oncommand="setServerType();" accesskey="&imapType.accesskey;"/>
             </radiogroup>
             <label id="serverPortLabel" control="serverPort"
                    accesskey="&portNum.accesskey;"
                    value="&portNum.label;"/>
             <html:input id="serverPort" type="number"
-                        class="size3 input-inline input-number-mozbox" max="65535"/>
+                        class="size3 input-inline" max="65535"/>
             <label id="defaultPortLabel" value="&defaultPortLabel.label;"/>
             <label id="defaultPortValue" value="&defaultPortValue.label;"/>
           </hbox>
           <separator/>
         </vbox>
 
         <vbox id="incomingServerbox">
           <description>&incomingServer.description;</description>
--- a/mailnews/base/prefs/content/SmtpServerEdit.xhtml
+++ b/mailnews/base/prefs/content/SmtpServerEdit.xhtml
@@ -58,17 +58,17 @@
           <html:input id="smtp.hostname"
                       type="text"
                       preftype="string"
                       class="uri-element input-inline"
                       prefstring="mail.smtpserver.%serverkey%.hostname"
                       aria-labelledby="smtp.hostname.label"/>
           <hbox align="center">
               <html:input id="smtp.port" type="number"
-                          class="size5 input-inline input-number-mozbox"
+                          class="size5 input-inline"
                           min="0" max="65535"
                           preftype="int"
                           prefstring="mail.smtpserver.%serverkey%.port"/>
               <label value="&serverPortDefault.label;"/>
               <label id="smtp.defaultPort"/>
           </hbox>
         </vbox>
       </hbox>
--- a/mailnews/base/prefs/content/am-junk.xhtml
+++ b/mailnews/base/prefs/content/am-junk.xhtml
@@ -193,17 +193,17 @@
                   pref="true"
                   wsm_persist="true"
                   preftype="bool"
                   prefstring="mail.server.%serverkey%.purgeSpam"
                   accesskey="&purge1.accesskey;"
                   oncommand="updateJunkRetention();"
                   label="&purge1.label;"/>
         <html:input id="server.purgeSpamInterval" type="number"
-                    class="size3 input-inline input-number-mozbox" min="1"
+                    class="size3 input-inline" min="1"
                     genericattr="true"
                     pref="true"
                     wsm_persist="true"
                     preftype="int"
                     aria-labelledby="server.purgeSpam server.purgeSpamInterval purgeLabel"
                     prefstring="mail.server.%serverkey%.purgeSpamInterval"/>
         <label id="purgeLabel"
                value="&purge2.label;"
--- a/mailnews/base/prefs/content/am-offline.xhtml
+++ b/mailnews/base/prefs/content/am-offline.xhtml
@@ -61,17 +61,17 @@
     <!-- IMAP Autosync Preference -->
     <radiogroup hidefor="pop3,nntp,movemail,none,rss" id="autosyncSelect" class="indent">
       <radio id="useAutosync.AllMsg" value="0" accesskey="&allAutosync.accesskey;"
              label="&allAutosync.label;" oncommand="onAutosyncChange();"/>
       <hbox flex="1" align="center">
         <radio id="useAutosync.ByAge" accesskey="&ageAutosync.accesskey;"
                value="1" label="&ageAutosyncBefore.label;" oncommand="onAutosyncChange();"/>
         <html:input id="autosyncValue" type="number"
-                    class="size4 input-inline autosync input-number-mozbox" min="1"
+                    class="size4 input-inline autosync" min="1"
                     onchange="onAutosyncChange();"
                     aria-labelledby="ageAutosyncBefore autosyncValue ageAutosyncMiddle autosyncInterval ageAutosyncAfter"/>
         <label id="ageAutosyncMiddle" control="autosyncValue" value="&ageAutosyncMiddle.label;"/>
         <menulist id="autosyncInterval" onselect="onAutosyncChange();">
           <menupopup>
             <menuitem label="&dayAgeInterval.label;" value="1"/>
             <menuitem label="&weekAgeInterval.label;" value="7"/>
             <menuitem label="&monthAgeInterval.label;" value="31"/>
@@ -94,30 +94,30 @@
                   label="&offlineNotDownload.label;"
                   accesskey="&offlineNotDownload.accesskey;"
                   oncommand="onCheckItem('offline.notDownloadMin', 'offline.notDownload');"/>
         <checkbox wsm_persist="true" id="autosync.notDownload" hidefor="pop3,nntp,movemail"
                   label="&autosyncNotDownload.label;"
                   accesskey="&autosyncNotDownload.accesskey;"
                   oncommand="onAutosyncNotDownload();"/>
         <html:input id="offline.notDownloadMin" type="number"
-                    class="size4 input-inline input-number-mozbox"
+                    class="size4 input-inline"
                     min="1" value="50"
                     wsm_persist="true"
                     aria-labelledby="offline.notDownload offline.notDownloadMin kbLabel"/>
         <label value="&kb.label;" control="offline.notDownloadMin" id="kbLabel"/>
     </hbox>
 
     <hbox align="center" class="indent" hidefor="movemail,pop3,imap,none,rss">
         <checkbox wsm_persist="true" id="nntp.downloadMsg"
                   label="&nntpDownloadMsg.label;"
                   accesskey="&nntpDownloadMsg.accesskey;"
                   oncommand="onCheckItem('nntp.downloadMsgMin', 'nntp.downloadMsg');"/>
         <html:input id="nntp.downloadMsgMin" type="number"
-                    class="size2 input-inline input-number-mozbox" min="1" value="30"
+                    class="size2 input-inline" min="1" value="30"
                     wsm_persist="true"
                     aria-labelledby="nntp.downloadMsg nntp.downloadMsgMin daysOldLabel"/>
         <label value="&daysOld.label;" control="nntp.downloadMsgMin"
                id="daysOldLabel"/>
     </hbox>
 
     <vbox align="start">
     <separator hidefor="none,rss"/>
@@ -128,41 +128,41 @@
     <radiogroup hidefor="" confirmfor="imap,pop3" id="retention.keepMsg" class="indent"
                 oncommand="warnServerRemove(this);">
         <radio id="retention.keepAllMsg" value="1" accesskey="&retentionKeepAll.accesskey;"
             label="&retentionKeepAll.label;" oncommand="onCheckKeepMsg();"/>
         <hbox flex="1" align="center">
             <radio id="retention.keepNewMsg" accesskey="&retentionKeepRecent.accesskey;"
                 value="3" label="&retentionKeepRecent.label;" oncommand="onCheckKeepMsg();"/>
             <html:input id="retention.keepNewMsgMin" type="number"
-                        class="size4 input-inline input-number-mozbox"
+                        class="size4 input-inline"
                         min="1" value="2000"
                         aria-labelledby="retention.keepNewMsg retention.keepNewMsgMin newMsgLabel"/>
             <label value="&message.label;" control="retention.keepNewMsgMin" id="newMsgLabel"/>
         </hbox>
         <hbox flex="1" align="center">
             <radio id="retention.keepOldMsg" accesskey="&retentionKeepMsg.accesskey;"
                 value="2" label="&retentionKeepMsg.label;" oncommand="onCheckKeepMsg();"/>
             <html:input id="retention.keepOldMsgMin" type="number"
-                        class="size4 input-inline input-number-mozbox" min="1" value="30"
+                        class="size4 input-inline" min="1" value="30"
                         aria-labelledby="retention.keepOldMsg retention.keepOldMsgMin oldMsgLabel"/>
             <label value="&daysOld.label;" control="retention.keepOldMsgMin" id="oldMsgLabel"/>
         </hbox>
     </radiogroup>
 
     <hbox align="center" class="indent">
       <checkbox id="retention.applyToFlagged"
                 label="&retentionApplyToFlagged.label;" hidefor=""
                 accesskey="&retentionApplyToFlagged.accesskey;"
                 checked="true"/>
     </hbox>
     <hbox align="center" class="indent" hidefor="movemail,pop3,imap,none,rss">
         <checkbox id="nntp.removeBody" accesskey="&nntpRemoveMsgBody.accesskey;"
                   label="&nntpRemoveMsgBody.label;" oncommand="onCheckItem('nntp.removeBodyMin', 'nntp.removeBody');"/>
         <html:input id="nntp.removeBodyMin" type="number"
-                    class="size2 input-inline input-number-mozbox" min="1" value="30"
+                    class="size2 input-inline" min="1" value="30"
                     aria-labelledby="nntp.removeBody nntp.removeBodyMin daysOldMsg"/>
         <label value="&daysOld.label;" control="nntp.removeBodyMin" id="daysOldMsg"/>
     </hbox>
     </vbox>
     </groupbox>
   </vbox>
 </window>
--- a/mailnews/base/prefs/content/am-server-advanced.xhtml
+++ b/mailnews/base/prefs/content/am-server-advanced.xhtml
@@ -50,17 +50,17 @@
 
       <separator class="groove"/>
       <hbox align="center">
         <label id="maximumConnectionsNumberLabel"
                control="maximumConnectionsNumber"
                value="&maximumConnectionsNumber.label;"
                accesskey="&maximumConnectionsNumber.accesskey;"/>
         <html:input id="maximumConnectionsNumber" type="number"
-                    class="size3 input-inline input-number-mozbox"
+                    class="size3 input-inline"
                     min="1" max="1000"
                     amsa_persist="true"
                     aria-labelledby="maximumConnectionsNumberLabel"/>
       </hbox>
 
       <separator class="groove"/>
       <description>&namespaceDesc.label;</description>
       <hbox class="indent">
--- a/mailnews/base/prefs/content/am-server.xhtml
+++ b/mailnews/base/prefs/content/am-server.xhtml
@@ -64,17 +64,17 @@
                     aria-labelledby="fixedServerName"/>
       </div>
       <div class="input-container" hidefor="movemail" style="grid-row: 2;">
         <xul:label value="&port.label;"
                    accesskey="&port.accesskey;" control="server.port"/>
         <xul:label id="fixedServerPort"
                    collapsed="true" use="server.port"/>
         <html:input id="server.port" type="number"
-                    class="size3 input-inline input-number-mozbox"
+                    class="size3 input-inline"
                     min="1" max="65535"
                     wsm_persist="true"
                     preftype="int"
                     prefstring="mail.server.%serverkey%.port"/>
         <xul:label value="&serverPortDefault.label;"/>
         <xul:label id="defaultPort"/>
       </div>
       <div hidefor="nntp" style="grid-row: 3;">
@@ -166,17 +166,17 @@
         <checkbox wsm_persist="true"
                   id="server.doBiff"
                   label="&biffStart.label;"
                   accesskey="&biffStart.accesskey;"
                   oncommand="onCheckItem('server.biffMinutes', [this.id]);"
                   prefattribute="value"
                   prefstring="mail.server.%serverkey%.check_new_mail"/>
         <html:input id="server.biffMinutes" type="number"
-                    class="size3 input-inline input-number-mozbox" min="1"
+                    class="size3 input-inline" min="1"
                     wsm_persist="true"
                     aria-labelledby="server.doBiff server.biffMinutes biffEnd"
                     preftype="int"
                     prefstring="mail.server.%serverkey%.check_time"/>
         <label id="biffEnd"
                control="server.biffMinutes"
                value="&biffEnd.label;"/>
       </hbox>
@@ -214,17 +214,17 @@
 
       <hbox align="center">
         <checkbox wsm_persist="true" id="pop3.deleteByAgeFromServer" class="indent"
                   label="&deleteByAgeFromServer.label;" oncommand="setupAgeMsgOnServerUI();"
                   accesskey="&deleteByAgeFromServer.accesskey;"
                   prefattribute="value"
                   prefstring="mail.server.%serverkey%.delete_by_age_from_server"/>
         <html:input id="pop3.numDaysToLeaveOnServer" type="number"
-                    class="size3 input-inline input-number-mozbox" min="1"
+                    class="size3 input-inline" min="1"
                     wsm_persist="true"
                     aria-labelledby="pop3.deleteByAgeFromServer pop3.numDaysToLeaveOnServer daysEnd"
                     preftype="int"
                     prefstring="mail.server.%serverkey%.num_days_to_leave_on_server"/>
         <label id="daysEnd" control="pop3.numDaysToLeaveOnServer" value="&daysEnd.label;"/>
       </hbox>
 
       <checkbox wsm_persist="true" id="pop3.deleteMailLeftOnServer" class="indent"
@@ -336,17 +336,17 @@
       <checkbox id="nntp.notifyOn"
                 wsm_persist="true"
                 label="&maxMessagesStart.label;"
                 accesskey="&maxMessagesStart.accesskey;"
                 oncommand="onCheckItem('nntp.maxArticles', [this.id]);"
                 prefattribute="value"
                 prefstring="mail.server.%serverkey%.notify.on"/>
       <html:input id="nntp.maxArticles" type="number"
-                  class="size4 input-inline input-number-mozbox" min="1"
+                  class="size4 input-inline" min="1"
                   wsm_persist="true"
                   aria-labelledby="nntp.notifyOn nntp.maxArticles maxMessagesEnd"
                   preftype="int"
                   prefstring="mail.server.%serverkey%.max_articles"/>
       <label control="nntp.maxArticles" value="&maxMessagesEnd.label;" id="maxMessagesEnd"/>
     </hbox>
     <checkbox hidefor="pop3,imap,movemail" wsm_persist="true" id="nntp.pushAuth"
               label="&alwaysAuthenticate.label;"
--- a/mailnews/base/search/content/searchWidgets.js
+++ b/mailnews/base/search/content/searchWidgets.js
@@ -791,17 +791,17 @@
                           stringTag="junkScoreOriginWhitelist"
                           class="search-value-menuitem"></menuitem>
                 <menuitem value="imapflag"
                           stringTag="junkScoreOriginImapFlag"
                           class="search-value-menuitem"></menuitem>
               </menupopup>
             </menulist>
             <html:input type="number"
-                        class="input-inline search-value-textbox input-number-mozbox"
+                        class="input-inline search-value-textbox"
                         inherits="disabled"/>
             <hbox flex="1"
                   class="search-value-custom"
                   inherits="disabled"></hbox>
           `)
         );
 
         // Initialize the priority picker.
--- a/mailnews/extensions/newsblog/content/am-newsblog.xhtml
+++ b/mailnews/extensions/newsblog/content/am-newsblog.xhtml
@@ -66,17 +66,17 @@
     <groupbox>
       <label class="header">&newFeedSettings.label;</label>
 
       <hbox align="center">
         <checkbox id="updateEnabled"
                   label="&biffStart.label;"
                   accesskey="&biffStart.accesskey;"
                   oncommand="setPrefs(this)"/>
-        <html:input id="updateValue" type="number" class="size3 input-number-mozbox" min="1"
+        <html:input id="updateValue" type="number" class="size3" min="1"
                     aria-labelledby="updateEnabled updateValue biffMinutes biffDays"
                     onchange="setPrefs(this)"/>
         <radiogroup id="biffUnits"
                     orient="horizontal"
                     oncommand="setPrefs(this)">
           <radio id="biffMinutes" value="min" label="&biffMinutes.label;"
                  accesskey="&biffMinutes.accesskey;"/>
           <radio id="biffDays" value="d" label="&biffDays.label;"
--- a/mailnews/extensions/newsblog/content/feed-subscriptions.xhtml
+++ b/mailnews/extensions/newsblog/content/feed-subscriptions.xhtml
@@ -1,16 +1,15 @@
 <?xml version="1.0"?>
 <!-- -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
    - This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/textbox.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger-newsblog/skin/feed-subscriptions.css" type="text/css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
 
 <!DOCTYPE window [
   <!ENTITY % feedDTD SYSTEM "chrome://messenger-newsblog/locale/feed-subscriptions.dtd">
     %feedDTD;
@@ -143,17 +142,17 @@
           </vbox>
         </hbox>
 
         <hbox align="center">
           <checkbox id="updateEnabled"
                     label="&biffStart.label;"
                     accesskey="&biffStart.accesskey;"
                     oncommand="FeedSubscriptions.setPrefs(this);"/>
-          <html:input id="updateValue" type="number" class="size3 input-number-mozbox" min="1"
+          <html:input id="updateValue" type="number" class="size3" min="1"
                       aria-labelledby="updateEnabled updateValue biffMinutes biffDays recommendedUnits recommendedUnitsVal"
                       oninput="FeedSubscriptions.setPrefs(this);"
                       onchange="FeedSubscriptions.setPrefs(this);"/>
           <radiogroup id="biffUnits"
                       orient="horizontal"
                       oncommand="FeedSubscriptions.setPrefs(this);">
             <radio id="biffMinutes" value="min" label="&biffMinutes.label;"
                    accesskey="&biffMinutes.accesskey;"/>
--- a/mailnews/news/content/downloadheaders.xhtml
+++ b/mailnews/news/content/downloadheaders.xhtml
@@ -23,17 +23,17 @@
       <radio id="all" label="&all.label;" accesskey="&all.accesskey;"
              oncommand="setupDownloadUI(false);"/>
       <separator class="thin"/>
       <hbox align="center" valign="middle">
         <radio id="some" selected="true" label="&download.label;"
                accesskey="&download.accesskey;"
                oncommand="setupDownloadUI(true);"
                aria-labelledby="some number headers"/>
-        <html:input id="number" type="number" class="input-number-mozbox" min="1"
+        <html:input id="number" type="number" min="1"
                     aria-labelledby="some number headers"/>
         <label id="headers" control="number"
                value="&headers.label;" accesskey="&headers.accesskey;"/>
       </hbox>
     </radiogroup>
 
     <hbox class="indent" align="start">
       <checkbox id="markread" label="&mark.label;" accesskey="&mark.accesskey;"/>