Backed out changeset aefedc124f9a (bug 1579516) as per Gijs req for causing a regression in Bug 1593060. a=backout
authorNarcis Beleuzu <nbeleuzu@mozilla.com>
Fri, 08 Nov 2019 10:53:35 +0200
changeset 559943 dc8f31580f29bf0be039faa8f2a70a985c0333bc
parent 559942 018fb6021a8654fac0adac73058f12fd9e95aa28
child 559944 d66f810451a908f11a929c72a337703f8195ce23
push id12275
push usernbeleuzu@mozilla.com
push dateFri, 08 Nov 2019 08:55:47 +0000
treeherdermozilla-beta@d66f810451a9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1579516, 1593060
milestone71.0
backs outaefedc124f9a4ad6598a6757fe0e3c5c688efa06
Backed out changeset aefedc124f9a (bug 1579516) as per Gijs req for causing a regression in Bug 1593060. a=backout
browser/components/preferences/languages.xul
browser/themes/shared/incontentprefs/preferences.inc.css
--- a/browser/components/preferences/languages.xul
+++ b/browser/components/preferences/languages.xul
@@ -33,34 +33,44 @@
   <stringbundleset id="languageSet">
     <stringbundle id="bundleAccepted"     src="resource://gre/res/language.properties"/>
   </stringbundleset>
 
   <description data-l10n-id="languages-description"/>
   <checkbox id="spoofEnglish"
             data-l10n-id="languages-customize-spoof-english"
             preference="privacy.spoof_english"/>
-  <box flex="1" style="display: grid; grid-template-rows: 1fr auto; grid-template-columns: 1fr auto;">
-    <richlistbox id="activeLanguages"
-                 seltype="multiple"
-                 onselect="gLanguagesDialog.onLanguageSelect();"/>
-    <vbox>
-      <button id="up" class="up" oncommand="gLanguagesDialog.moveUp();" disabled="true"
-              data-l10n-id="languages-customize-moveup"
-              preference="pref.browser.language.disable_button.up"/>
-      <button id="down" class="down" oncommand="gLanguagesDialog.moveDown();" disabled="true"
-              data-l10n-id="languages-customize-movedown"
-              preference="pref.browser.language.disable_button.down"/>
-      <button id="remove" oncommand="gLanguagesDialog.removeLanguage();" disabled="true"
-              data-l10n-id="languages-customize-remove"
-              preference="pref.browser.language.disable_button.remove"/>
-    </vbox>
-    <!-- This <vbox> is needed to position search tooltips correctly. -->
-    <vbox>
-      <menulist id="availableLanguages" oncommand="gLanguagesDialog.onAvailableLanguageSelect();"
-                data-l10n-id="languages-customize-select-language" data-l10n-attrs="placeholder">
-        <menupopup id="availableLanguagesPopup"/>
-      </menulist>
-    </vbox>
-    <button id="addButton" class="add-web-language" oncommand="gLanguagesDialog.addLanguage();" disabled="true"
-            data-l10n-id="languages-customize-add"/>
-  </box>
+  <grid flex="1">
+    <columns>
+      <column flex="1"/>
+      <column/>
+    </columns>
+    <rows>
+      <row flex="1">
+        <richlistbox id="activeLanguages" flex="1"
+                     seltype="multiple"
+                     onselect="gLanguagesDialog.onLanguageSelect();"/>
+        <vbox>
+          <button id="up" class="up" oncommand="gLanguagesDialog.moveUp();" disabled="true"
+                  data-l10n-id="languages-customize-moveup"
+                  preference="pref.browser.language.disable_button.up"/>
+          <button id="down" class="down" oncommand="gLanguagesDialog.moveDown();" disabled="true"
+                  data-l10n-id="languages-customize-movedown"
+                  preference="pref.browser.language.disable_button.down"/>
+          <button id="remove" oncommand="gLanguagesDialog.removeLanguage();" disabled="true"
+                  data-l10n-id="languages-customize-remove"
+                  preference="pref.browser.language.disable_button.remove"/>
+        </vbox>
+      </row>
+      <row>
+        <!-- This <vbox> is needed to position search tooltips correctly. -->
+        <vbox>
+          <menulist id="availableLanguages" oncommand="gLanguagesDialog.onAvailableLanguageSelect();"
+                    data-l10n-id="languages-customize-select-language" data-l10n-attrs="placeholder">
+            <menupopup id="availableLanguagesPopup"/>
+          </menulist>
+        </vbox>
+        <button id="addButton" class="add-web-language" oncommand="gLanguagesDialog.addLanguage();" disabled="true"
+                data-l10n-id="languages-customize-add"/>
+      </row>
+    </rows>
+  </grid>
 </dialog>
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -270,16 +270,20 @@ button > hbox > label {
 #getStarted {
   font-size: 90%;
 }
 
 #useDocumentColors {
   margin: 0;
 }
 
+#activeLanguages {
+  height: 16em;
+}
+
 #activeLanguages > richlistitem {
   padding: 0.3em;
 }
 
 #downloadFolder {
   -moz-box-flex: 1;
   margin-inline-start: 0;
   padding-inline-start: 30px;