From 59df672bd2d5143a92fd90cf8a7765c6fef41626 Mon Sep 17 00:00:00 2001
From: Scott Chacon <schacon@gmail.com>
Date: Thu, 3 Aug 2023 10:39:35 +0200
Subject: [PATCH] fix the disabled button state, less whitespace padding, fix
 login text

---
 src/lib/components/Login.svelte                 | 8 +++++---
 src/routes/repo/[projectId]/RenderedLine.svelte | 2 +-
 src/routes/user/+page.svelte                    | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/lib/components/Login.svelte b/src/lib/components/Login.svelte
index 7240faf99..c76d8873a 100644
--- a/src/lib/components/Login.svelte
+++ b/src/lib/components/Login.svelte
@@ -49,11 +49,13 @@
 	<Button kind="plain" color="destructive" on:click={() => ($user = null)}>Log out</Button>
 {:else if $token !== null}
 	{#await Promise.all([open($token.url), pollForUser($token.token)])}
-		<div>Log in in your system browser</div>
+		<div class="text-light-700">
+			Your browser should have been opened. Please log into your GitButler account there.
+		</div>
 	{/await}
 	<p>
-		<button class="underline" on:click={() => open($authUrl)}>Click here</button>
-		if you are not redirected automatically, you can
+		If you were not redirected automatically, you can
+		<button class="underline" on:click={() => open($authUrl)}>click here</button>
 	</p>
 {:else}
 	<Button {width} loading={signUpOrLoginLoading} color="purple" on:click={onSignUpOrLoginClick}>
diff --git a/src/routes/repo/[projectId]/RenderedLine.svelte b/src/routes/repo/[projectId]/RenderedLine.svelte
index c4f547c22..467c5c121 100644
--- a/src/routes/repo/[projectId]/RenderedLine.svelte
+++ b/src/routes/repo/[projectId]/RenderedLine.svelte
@@ -11,7 +11,7 @@
 	function toTokens(codeString: string): string[] {
 		function sanitize(text: string) {
 			var element = document.createElement('div');
-			element.innerText = text;
+			element.innerText = text.replace(/\t/g, ' ').replace('   ', ' ');
 			return element.innerHTML;
 		}
 
diff --git a/src/routes/user/+page.svelte b/src/routes/user/+page.svelte
index 0b3ba7316..5fc4a9e0a 100644
--- a/src/routes/user/+page.svelte
+++ b/src/routes/user/+page.svelte
@@ -233,7 +233,7 @@
 						class="peer sr-only"
 					/>
 					<div
-						class="peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 dark:bg-gray-700 dark:border-gray-600 peer h-6 w-11 rounded-full bg-gray-400 after:absolute after:left-[2px] after:top-[2px] after:h-5 after:w-5 after:rounded-full after:bg-white after:transition-all after:content-[''] peer-checked:bg-purple-600 peer-checked:after:translate-x-full peer-checked:after:border-white peer-focus:outline-none peer-focus:ring-4"
+						class="peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 dark:bg-gray-700 dark:border-gray-600 peer h-6 w-11 rounded-full bg-gray-400 after:absolute after:left-[2px] after:top-[2px] after:h-5 after:w-5 after:rounded-full after:bg-white after:transition-all after:content-[''] peer-checked:bg-purple-600 peer-checked:after:translate-x-full peer-checked:after:border-white peer-focus:outline-none peer-focus:ring-4 peer-disabled:bg-zinc-300"
 					/>
 				</label>
 			</div>