From c805f7eb42569e3b848d37df27f54ce79ffac217 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 12 Nov 2018 14:39:56 +0100
Subject: [PATCH] Elastic: Visual improvements on logon screen

---
 skins/elastic/styles/styles.less   | 15 ++++++++++-----
 skins/elastic/templates/login.html |  2 +-
 skins/elastic/ui.js                |  3 ++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/skins/elastic/styles/styles.less b/skins/elastic/styles/styles.less
index 55be46301..8a7766d46 100644
--- a/skins/elastic/styles/styles.less
+++ b/skins/elastic/styles/styles.less
@@ -145,25 +145,30 @@ a {
 .task-login #layout .content #logo {
     display: inline-block;
     position: relative;
-    top: 18vh;
-    max-height: 90px;
+    top: 16vh;
+    max-height: 100px;
 }
 
 #login-form {
     margin: 0 auto;
-    top: 22vh;
+    top: 20vh;
     width: 95%;
-    max-width: 280px;
+    max-width: 320px;
     position: relative;
 
     // Fixes input width and position in IE11
     .row {
-        max-width: 280px;
         margin-right: 0;
         margin-left: 0;
     }
 }
 
+#rcmloginsubmit {
+    &:before {
+        display: none !important;
+    }
+}
+
 #login-footer {
     flex: 1;
     color: @color-black-shade-text;
diff --git a/skins/elastic/templates/login.html b/skins/elastic/templates/login.html
index 5a04be8d8..da527606b 100644
--- a/skins/elastic/templates/login.html
+++ b/skins/elastic/templates/login.html
@@ -10,7 +10,7 @@
 			<roundcube:object name="productname" condition="config:display_product_info &gt; 0" />
 			<roundcube:object name="version" condition="config:display_product_info == 2" />
 			<roundcube:if condition="config:support_url" />
-				&nbsp;&#9899;&nbsp; <a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link"><roundcube:label name="support" /></a>
+				&nbsp;&bull;&nbsp; <a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link"><roundcube:label name="support" /></a>
 			<roundcube:endif />
 			<roundcube:container name="loginfooter" id="login-footer" />
 		</div>
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index b42ef2582..e66c8dd65 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -996,6 +996,7 @@ function rcube_elastic_ui()
 
         // Make logon form prettier
         if (rcmail.env.task == 'login' && context == document) {
+            $('#rcmloginsubmit').addClass('btn-lg text-uppercase w-100');
             $('#login-form table tr').each(function() {
                 var input = $('input,select', this),
                     label = $('label', this),
@@ -1011,7 +1012,7 @@ function rcube_elastic_ui()
                 input.addClass(input.is('select') ? 'custom-select' : 'form-control')
                     .attr('placeholder', label.text())
                     .before($('<span class="input-group-prepend">').append(icon))
-                    .parent().addClass('input-group');
+                    .parent().addClass('input-group input-group-lg');
             });
         }