Merge branch 'master' of github.com:discourse/discourse

app/assets/stylesheets/desktop/login.scss

@@ -75,7 +75,8 @@
     flex: 1 1 50%;
     align-items: center;
     padding: 0 15px;
-    form, table {
+    form,
+    table {
       width: 100%;
     }
 
@@ -93,13 +94,39 @@
     input,
     label {
       margin-bottom: 0;
-      width: 100%;      
+      width: 100%;
     }
     .tip {
       max-width: 340px;
     }
   }
 
+  .user-field {
+    display: flex;
+    flex-direction: column;
+
+    &.confirm {
+      margin-top: 5px;
+    }
+
+    > label {
+      width: auto;
+      font-weight: bold;
+    }
+
+    .select-kit {
+      width: 242px; // match text-input width
+    }
+
+    .controls {
+      margin-left: 0;
+
+      .instructions {
+        margin-top: 5px;
+      }
+    }
+  }
+
   .invites-show {
     padding-top: 20px;
 
@@ -174,4 +201,4 @@
       width: 240px;
     }
   }
-}
+}