From 9e1e1d45b19e9fe959d8dfe95582397e844b02ea Mon Sep 17 00:00:00 2001
From: Bruno <bruno@coder.com>
Date: Tue, 31 May 2022 15:46:11 +0000
Subject: [PATCH 1/3] Make login header inline

---
 site/src/components/Welcome/Welcome.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/site/src/components/Welcome/Welcome.tsx b/site/src/components/Welcome/Welcome.tsx
index 6414af1ba0661..382bdbf221c6d 100644
--- a/site/src/components/Welcome/Welcome.tsx
+++ b/site/src/components/Welcome/Welcome.tsx
@@ -12,11 +12,7 @@ export const Welcome: FC = () => {
         <CoderIcon className={styles.logo} />
       </div>
       <Typography className={styles.title} variant="h1">
-        <>
-          Welcome to
-          <br />
-          Coder
-        </>
+        Welcome to <strong>Coder</strong>
       </Typography>
     </div>
   )

From 5c559eb30a5a2f3d3692cc4f4ea43d1b81051f37 Mon Sep 17 00:00:00 2001
From: Bruno <bruno@coder.com>
Date: Tue, 31 May 2022 15:58:28 +0000
Subject: [PATCH 2/3] Add GitHub icon

---
 site/src/components/SignInForm/SignInForm.tsx | 55 ++++++++++++++++---
 1 file changed, 48 insertions(+), 7 deletions(-)

diff --git a/site/src/components/SignInForm/SignInForm.tsx b/site/src/components/SignInForm/SignInForm.tsx
index 6dff3c4251551..4613ac71e3500 100644
--- a/site/src/components/SignInForm/SignInForm.tsx
+++ b/site/src/components/SignInForm/SignInForm.tsx
@@ -3,6 +3,7 @@ import FormHelperText from "@material-ui/core/FormHelperText"
 import Link from "@material-ui/core/Link"
 import { makeStyles } from "@material-ui/core/styles"
 import TextField from "@material-ui/core/TextField"
+import GitHubIcon from "@material-ui/icons/GitHub"
 import { FormikContextType, useFormik } from "formik"
 import { FC } from "react"
 import * as Yup from "yup"
@@ -49,6 +50,29 @@ const useStyles = makeStyles((theme) => ({
   submitBtn: {
     marginTop: theme.spacing(2),
   },
+  buttonIcon: {
+    width: 14,
+    height: 14,
+  },
+  divider: {
+    paddingTop: theme.spacing(3),
+    paddingBottom: theme.spacing(3),
+    display: "flex",
+    alignItems: "center",
+    gap: theme.spacing(2),
+  },
+  dividerLine: {
+    width: "100%",
+    height: 1,
+    backgroundColor: theme.palette.divider,
+  },
+  dividerLabel: {
+    flexShrink: 0,
+    color: theme.palette.text.secondary,
+    textTransform: "uppercase",
+    fontSize: 12,
+    letterSpacing: 1,
+  },
 }))
 
 export interface SignInFormProps {
@@ -119,13 +143,30 @@ export const SignInForm: FC<SignInFormProps> = ({
         </div>
       </form>
       {authMethods?.github && (
-        <div className={styles.submitBtn}>
-          <Link href={`/api/v2/users/oauth2/github/callback?redirect=${encodeURIComponent(redirectTo)}`}>
-            <Button disabled={isLoading} fullWidth type="submit" variant="contained">
-              {Language.githubSignIn}
-            </Button>
-          </Link>
-        </div>
+        <>
+          <div className={styles.divider}>
+            <div className={styles.dividerLine} />
+            <div className={styles.dividerLabel}>Or sign in with</div>
+            <div className={styles.dividerLine} />
+          </div>
+
+          <div>
+            <Link
+              underline="none"
+              href={`/api/v2/users/oauth2/github/callback?redirect=${encodeURIComponent(redirectTo)}`}
+            >
+              <Button
+                startIcon={<GitHubIcon className={styles.buttonIcon} />}
+                disabled={isLoading}
+                fullWidth
+                type="submit"
+                variant="contained"
+              >
+                {Language.githubSignIn}
+              </Button>
+            </Link>
+          </div>
+        </>
       )}
     </>
   )

From 4c555b3cb757e552e12c89f3e9912c1509f31752 Mon Sep 17 00:00:00 2001
From: Bruno Quaresma <bruno@coder.com>
Date: Tue, 31 May 2022 11:31:05 -0500
Subject: [PATCH 3/3] Update site/src/components/SignInForm/SignInForm.tsx

Co-authored-by: Kyle Carberry <kyle@coder.com>
---
 site/src/components/SignInForm/SignInForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/components/SignInForm/SignInForm.tsx b/site/src/components/SignInForm/SignInForm.tsx
index 4613ac71e3500..693c8e58c4bb9 100644
--- a/site/src/components/SignInForm/SignInForm.tsx
+++ b/site/src/components/SignInForm/SignInForm.tsx
@@ -146,7 +146,7 @@ export const SignInForm: FC<SignInFormProps> = ({
         <>
           <div className={styles.divider}>
             <div className={styles.dividerLine} />
-            <div className={styles.dividerLabel}>Or sign in with</div>
+            <div className={styles.dividerLabel}>Or</div>
             <div className={styles.dividerLine} />
           </div>