gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-27 03:22:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #925 from gitbutlerapp/ui-updates

Browse Source 
fix the disabled button state, less whitespace padding, fix login text
This commit is contained in:
Scott Chacon 2023-08-03 10:42:22 +02:00 committed by GitHub
commit 1d4ed6e628
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/components/Login.svelte
View File

@ -49,11 +49,13 @@
<Button kind="plain" color="destructive" on:click={() => ($user = null)}>Log out</Button> <Button kind="plain" color="destructive" on:click={() => ($user = null)}>Log out</Button>
{:else if $token !== null} {:else if $token !== null}
{#await Promise.all([open($token.url), pollForUser($token.token)])} {#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} {/await}
<p> <p>
<button class="underline" on:click={() => open($authUrl)}>Click here</button> If you were not redirected automatically, you can
if you are not redirected automatically, you can <button class="underline" on:click={() => open($authUrl)}>click here</button>
</p> </p>
{:else} {:else}
<Button {width} loading={signUpOrLoginLoading} color="purple" on:click={onSignUpOrLoginClick}> <Button {width} loading={signUpOrLoginLoading} color="purple" on:click={onSignUpOrLoginClick}>

2
src/routes/repo/[projectId]/RenderedLine.svelte
View File

@ -11,7 +11,7 @@
function toTokens(codeString: string): string[] { function toTokens(codeString: string): string[] {
function sanitize(text: string) { function sanitize(text: string) {
var element = document.createElement('div'); var element = document.createElement('div');
element.innerText = text; element.innerText = text.replace(/\t/g, ' ').replace(' ', ' ');
return element.innerHTML; return element.innerHTML;
} }

2
src/routes/user/+page.svelte
View File

@ -233,7 +233,7 @@
class="peer sr-only" class="peer sr-only"
/> />
<div <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> </label>
</div> </div>