Handle wider default width of drop-down menu buttons on Firefox 98

(issue #377)
aecreations · Mar 6, 2022 · 2ed2467 · 2ed2467
1 parent e047073
commit 2ed2467
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 11 deletions.
diff --git a/wx-src/pages/new.css b/wx-src/pages/new.css
@@ -171,14 +171,6 @@ ul.fancytree-container {
     margin-left: 26px;
 }
 
-body[data-locale="de"] #clipping-options {
-    letter-spacing: -0.16px;
-}
-
-body[data-locale|="pt"] #clipping-options {
-    letter-spacing: -0.25px;
-}
-
 #btn-expand-options {
     position: relative;
     top: -24px;
@@ -207,6 +199,10 @@ body[data-locale|="pt"] #clipping-options {
     font-size: 12px;
 }
 
+#clipping-options #save-source-url {
+    margin-left: 0;
+}
+
 #clipping-options #shct-key-and-label-opts {
     margin-top: 10px;
 }
@@ -234,6 +230,31 @@ body[data-locale|="pt"] #clipping-options {
     vertical-align: middle;
 }
 
+body[data-locale="uk"] #clipping-key-lbl,
+body[data-locale="uk"] #clipping-label-picker-lbl,
+body[data-locale|="pt"] #clipping-key-lbl,
+body[data-locale|="pt"] #clipping-label-picker-lbl,
+body[data-locale|="es"] #clipping-key-lbl,
+body[data-locale|="es"] #clipping-label-picker-lbl {
+    display: block;
+    margin-bottom: 4px;
+}
+
+body[data-locale="fr"] #clipping-key-lbl,
+body[data-locale="fr"] #clipping-label-picker-lbl,
+body[data-locale="de"] #clipping-key-lbl,
+body[data-locale="de"] #clipping-label-picker-lbl {
+    letter-spacing: -0.5px;
+}
+
+body:not([data-locale="uk"]):not([data-locale|="pt"]):not([data-locale|="es"]) #clipping-key {
+    width: 78px;
+}
+
+body:not([data-locale="uk"]):not([data-locale|="pt"]):not([data-locale|="es"]) #clipping-label-picker {
+    width: 86px;
+}
+
 #dlg-buttons {
     z-index: 1;
 }

diff --git a/wx-src/pages/new.html b/wx-src/pages/new.html
@@ -49,7 +49,7 @@
 	  </div>
 	  <div id="shct-key-and-label-opts" class="row hbox">
 	    <div id="shortcut-key-select">
-	      <label for="clipping-key" data-i18n="labelShortcutKey"></label>
+	      <label id="clipping-key-lbl" for="clipping-key" data-i18n="labelShortcutKey"></label>
 	      <select id="clipping-key" class="browser-style">
 		<option data-i18n="none"></option>
 		<option>A</option>
@@ -93,7 +93,7 @@
 	    </div>
 	    <div id="clipping-options-spacer" class="spacer"></div>
 	    <div id="clipping-label">
-	      <label for="clipping-label-picker" data-i18n="labelLabel"></label>
+	      <label id="clipping-label-picker-lbl" for="clipping-label-picker" data-i18n="labelLabel"></label>
 	      <select id="clipping-label-picker" class="browser-style">
 		<option value="" data-i18n="none"></option>
 		<option value="red" data-i18n="labelRed"></option>

diff --git a/wx-src/pages/new.js b/wx-src/pages/new.js
@@ -63,7 +63,7 @@ async function initHelper()
     }
 
     let lang = browser.i18n.getUILanguage();
-    if (lang == "uk" || lang.startsWith("es")) {
+    if (lang == "uk" || lang.startsWith("pt") || lang.startsWith("es")) {
       height += DLG_HEIGHT_ADJ_LOCALE;
     }