From eb0d8839c2688037e0f163d0ca432d4b11947873 Mon Sep 17 00:00:00 2001
From: Sebastian Castro <sebastian.castro@protonmail.com>
Date: Mon, 6 Apr 2020 19:32:54 +0200
Subject: [PATCH] css: minor improvements

---
 src/static/css/pad/icons.css                  |  3 +-
 src/static/css/pad/popup_import_export.css    |  7 ++-
 src/static/css/pad/toolbar.css                |  1 -
 .../colibris/src/components/import-export.css |  5 ---
 .../skins/colibris/src/components/popup.css   | 13 +++++-
 .../skins/colibris/src/components/toolbar.css |  3 +-
 src/templates/pad.html                        | 44 +++++++++++--------
 7 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/src/static/css/pad/icons.css b/src/static/css/pad/icons.css
index 1cc84db6f..329114909 100644
--- a/src/static/css/pad/icons.css
+++ b/src/static/css/pad/icons.css
@@ -13,7 +13,6 @@
 .buttonicon {
   border: none;
   padding: 0;
-  color: #666;
   background: none;
   text-align: center;
   font-style: normal;
@@ -164,7 +163,7 @@
 .buttonicon-table:before { content: '\f0ce'; } /* '' */
 /* END Of FONTELLO GENERATED CSS */
 
-.icon-spin {
+.icon-spin:before {
   -webkit-animation: spinAnimation 2s infinite linear;
   animation: spinAnimation 2s infinite linear;
   font-family: "fontawesome-etherpad";
diff --git a/src/static/css/pad/popup_import_export.css b/src/static/css/pad/popup_import_export.css
index 0f2e70b5f..3bfe0722e 100644
--- a/src/static/css/pad/popup_import_export.css
+++ b/src/static/css/pad/popup_import_export.css
@@ -2,11 +2,11 @@
   display: none;
 }
 .exportlink {
-  margin-bottom: 5px;
+  margin-bottom: 10px;
   display: block;
 }
 .exporttype:before {
-  margin-right: 5px !important;
+  margin-right: 10px !important;
 }
 
 /* hidden element */
@@ -22,6 +22,5 @@
 }
 
 #importsubmitinput {
-  margin-top: 12px;
-  padding: 2px 4px 2px 4px;
+  margin-top: 10px;
 }
\ No newline at end of file
diff --git a/src/static/css/pad/toolbar.css b/src/static/css/pad/toolbar.css
index b517370c1..753c2a05f 100644
--- a/src/static/css/pad/toolbar.css
+++ b/src/static/css/pad/toolbar.css
@@ -72,7 +72,6 @@
 }
 
 .toolbar ul li select {
-  background: #fff;
   padding: 4px;
   line-height: 22px;
   height: 28px;
diff --git a/src/static/skins/colibris/src/components/import-export.css b/src/static/skins/colibris/src/components/import-export.css
index d09fc872c..292941d65 100644
--- a/src/static/skins/colibris/src/components/import-export.css
+++ b/src/static/skins/colibris/src/components/import-export.css
@@ -6,11 +6,6 @@
   text-decoration: underline;
 }
 
-.exporttype {
-  margin-left: 5px;
-  margin-bottom: 10px;
-}
-
 #importmessagefail {
   margin-top: 10px;
 }
diff --git a/src/static/skins/colibris/src/components/popup.css b/src/static/skins/colibris/src/components/popup.css
index 107aaf31a..a3db08525 100644
--- a/src/static/skins/colibris/src/components/popup.css
+++ b/src/static/skins/colibris/src/components/popup.css
@@ -1,5 +1,5 @@
 .popup-content {
-  border-radius: 3px;
+  border-radius: 5px;
   padding: 25px;
   background: none;
   background-color: white;
@@ -32,3 +32,14 @@
     border: none !important;
   }
 }
+
+.popup .dropdowns-container .dropdown-line {
+  margin-top: 15px;
+}
+.popup .dropdowns-container label {
+  width: 120px;
+  display: inline-block;
+}
+.popup .dropdowns-container select {
+  min-width: 180px;
+}
diff --git a/src/static/skins/colibris/src/components/toolbar.css b/src/static/skins/colibris/src/components/toolbar.css
index 0c220a3bc..e26638cff 100644
--- a/src/static/skins/colibris/src/components/toolbar.css
+++ b/src/static/skins/colibris/src/components/toolbar.css
@@ -14,7 +14,7 @@
 }
 
 .toolbar ul li {
-  margin: 5px 1px;
+  margin: 7px 1px;
 }
 .toolbar ul li a, .toolbar .buttonicon {
   color: inherit;
@@ -75,6 +75,7 @@
 .toolbar ul li select {
   cursor: pointer;
   border: none;
+  background-color: inherit;
   border-radius: 3px;
   width: auto;
   font-weight: bold;
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 44329e8d2..0fee58cc6 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -143,26 +143,32 @@
           </p>
           <% e.end_block(); %>
 
-          <% e.begin_block("mySettings.dropdowns"); %>
-          <label for="viewfontmenu" data-l10n-id="pad.settings.fontType">Font type:</label>
-          <select id="viewfontmenu">
-            <option value="" data-l10n-id="pad.settings.fontType.normal">Normal</option>
-            <%= fonts = [
-                      "Quicksand", "Roboto", "Montserrat", "OpenDyslexic", "monospace", "RobotoMono",
-                      "Arial", "Georgia", "Times New Roman", "Verdana", "Courrier New",
-                      "Open Sans", "Lato", "Helvetica" ] %>
-            <% for(var i=0; i < fonts.length; i++) { %>
-              <option value="<%=fonts[i]%>"><%=fonts[i]%></option>
-            <% } %>
-          </select>
+          <div class="dropdowns-container">
+            <% e.begin_block("mySettings.dropdowns"); %>
+            <p class="dropdown-line">
+              <label for="viewfontmenu" data-l10n-id="pad.settings.fontType">Font type:</label>
+              <select id="viewfontmenu">
+                <option value="" data-l10n-id="pad.settings.fontType.normal">Normal</option>
+                <%= fonts = [
+                          "Quicksand", "Roboto", "Montserrat", "OpenDyslexic", "monospace", "RobotoMono",
+                          "Arial", "Georgia", "Times New Roman", "Verdana", "Courrier New",
+                          "Open Sans", "Lato", "Helvetica" ] %>
+                <% for(var i=0; i < fonts.length; i++) { %>
+                  <option value="<%=fonts[i]%>"><%=fonts[i]%></option>
+                <% } %>
+              </select>
+            </p>
 
-          <label for="languagemenu" data-l10n-id="pad.settings.language">Language:</label>
-          <select id="languagemenu">
-              <% for (lang in langs) { %>
-              <option value="<%=lang%>"><%=langs[lang].nativeName%></option>
-              <% } %>
-          </select>
-          <% e.end_block(); %>
+            <p class="dropdown-line">
+              <label for="languagemenu" data-l10n-id="pad.settings.language">Language:</label>
+              <select id="languagemenu">
+                  <% for (lang in langs) { %>
+                  <option value="<%=lang%>"><%=langs[lang].nativeName%></option>
+                  <% } %>
+              </select>
+            </p>
+            <% e.end_block(); %>
+          </div>
 
           <h2 data-l10n-id="pad.settings.about">About</h2>
           <span data-l10n-id="pad.settings.poweredBy">Powered by</span>