Backed out changeset 5700b7f04288 (bug 1581747) as per Gijs req for causing Bug 1593060. a=backout
authorNarcis Beleuzu <nbeleuzu@mozilla.com>
Fri, 08 Nov 2019 12:11:08 +0200
changeset 559947 b173ec666522c4b8c697afed0532422a6b681832
parent 559946 fd86ac5d950cde5232d6427c7eadf2a64e7a9908
child 559948 7a39b227351bbb5ba7c9e797c42cf97a60048b23
push id12277
push usernbeleuzu@mozilla.com
push dateFri, 08 Nov 2019 10:23:59 +0000
treeherdermozilla-beta@b173ec666522 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1581747, 1593060
milestone71.0
backs out5700b7f042880dbec787bf585b542cb6c6b28f59
Backed out changeset 5700b7f04288 (bug 1581747) as per Gijs req for causing Bug 1593060. a=backout
browser/components/preferences/browserLanguages.xul
browser/themes/shared/incontentprefs/preferences.inc.css
--- a/browser/components/preferences/browserLanguages.xul
+++ b/browser/components/preferences/browserLanguages.xul
@@ -24,32 +24,41 @@
   </linkset>
 
   <script src="chrome://browser/content/utilityOverlay.js"/>
   <script src="chrome://global/content/preferencesBindings.js"/>
   <script src="chrome://browser/content/preferences/browserLanguages.js"/>
 
   <description data-l10n-id="browser-languages-description"/>
 
-  <box flex="1" style="display: grid; grid-template-rows: 1fr auto; grid-template-columns: 1fr auto;">
-    <richlistbox id="selectedLocales"/>
-    <vbox>
-      <button id="up" class="action-button" disabled="true" data-l10n-id="languages-customize-moveup"/>
-      <button id="down" class="action-button" disabled="true" data-l10n-id="languages-customize-movedown"/>
-      <button id="remove" class="action-button" disabled="true" data-l10n-id="languages-customize-remove"/>
-    </vbox>
-
-    <menulist id="availableLocales"
-              class="available-locales-list"
-              data-l10n-id="browser-languages-select-language"
-              data-l10n-attrs="placeholder,label">
-      <menupopup/>
-    </menulist>
-    <button id="add"
-            class="add-browser-language action-button"
-            data-l10n-id="languages-customize-add"
-            disabled="true"/>
-  </box>
+  <grid flex="1">
+    <columns>
+      <column flex="1"/>
+      <column/>
+    </columns>
+    <rows>
+      <row>
+        <richlistbox id="selectedLocales"/>
+        <vbox>
+          <button id="up" class="action-button" disabled="true" data-l10n-id="languages-customize-moveup"/>
+          <button id="down" class="action-button" disabled="true" data-l10n-id="languages-customize-movedown"/>
+          <button id="remove" class="action-button" disabled="true" data-l10n-id="languages-customize-remove"/>
+        </vbox>
+      </row>
+      <row>
+        <menulist id="availableLocales"
+                  class="available-locales-list"
+                  data-l10n-id="browser-languages-select-language"
+                  data-l10n-attrs="placeholder,label">
+          <menupopup/>
+        </menulist>
+        <button id="add"
+                class="add-browser-language action-button"
+                data-l10n-id="languages-customize-add"
+                disabled="true"/>
+      </row>
+    </rows>
+  </grid>
   <hbox id="warning-message" class="message-bar message-bar-warning" hidden="true">
     <image class="message-bar-icon"/>
     <description class="message-bar-description" data-l10n-id="browser-languages-error"/>
   </hbox>
 </dialog>
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -980,16 +980,20 @@ menulist[indicator=true] > menupopup men
   margin-inline-start: 4px;
 }
 
 #defaultBrowserLanguage {
   margin-inline-start: 0;
   min-width: 20em;
 }
 
+#selectedLocales {
+  height: 150px;
+}
+
 #selectedLocales > richlistitem {
   padding-inline-start: 13px;
 }
 
 #availableLanguages,
 #availableLocales {
   margin: 0;
   margin-inline-end: 4px;