From d449834a28b0c53257f7d6cbec5212847309ca08 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 19 Dec 2019 20:37:47 -0500
Subject: [PATCH] FIX: Show signup input tips and improve spacing

---
 .../discourse/templates/components/input-tip.hbs |  2 +-
 app/assets/stylesheets/common/base/login.scss    | 16 ++++++++++++----
 app/assets/stylesheets/desktop/login.scss        |  8 +++++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/input-tip.hbs b/app/assets/javascripts/discourse/templates/components/input-tip.hbs
index ade54357b51..32182f3e458 100644
--- a/app/assets/javascripts/discourse/templates/components/input-tip.hbs
+++ b/app/assets/javascripts/discourse/templates/components/input-tip.hbs
@@ -1 +1 @@
-{{tipIcon}} {{tipReason}}
+{{tipIcon}}{{tipReason}}
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index fa1af85ec78..fc6c4094e8a 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -12,6 +12,17 @@
   display: none;
 }
 
+.login-form .tip {
+  .d-icon {
+    margin-right: 0.25em;
+  }
+  &:not(:empty) {
+    + td {
+      display: none;
+    }
+  }
+}
+
 #login-form {
   table {
     width: 100%;
@@ -72,9 +83,6 @@
       margin-bottom: 0;
       padding-top: 5px;
     }
-    &:first-of-type > label {
-      margin-top: 0;
-    }
 
     input[type="text"] {
       margin-bottom: 0;
@@ -93,7 +101,7 @@
         font-weight: normal;
       }
       .instructions {
-        margin-top: 0.15em;
+        margin-top: 0.4em;
         color: $primary-medium;
         line-height: $line-height-medium;
       }
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 8ddc7f7d21f..84b451bb7a4 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -222,6 +222,10 @@
       margin-top: 5px;
     }
 
+    &:first-of-type > label {
+      margin-top: 0;
+    }
+
     > label {
       width: auto;
     }
@@ -265,12 +269,14 @@
 
 .login-form {
   .tip {
-    &:not(:empty) + td {
+    &:empty {
       display: none;
     }
+
     &:not(:empty),
     &:empty + td {
       min-height: 1.75em;
+      margin-top: 0.25em;
       &.bad .svg-icon {
         vertical-align: middle;
       }