Skip to content

fix: Windows overspill #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2021
Merged

fix: Windows overspill #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61455fa
fix: Windows overspill
obany Mar 16, 2021
6a85395
fix: Further overspill fixes
obany Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/shared/components/AccountTile.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<style type="text/scss">
button {
height: auto;
min-height: 92px;
min-height: 110px;
&.size-m,
&.size-l {
height: 70%;
Expand All @@ -29,7 +29,7 @@
<Text
smaller={size === 's'}
overrideColor
classes="block text-gray-800 dark:text-white group-hover:text-white group-hover:font-700">
classes="block text-gray-800 dark:text-white group-hover:text-white group-hover:font-700 mr-4">
{balance}
</Text>
<Text smaller={size === 's'} overrideColor classes="block text-blue-500 dark:text-gray-600 group-hover:text-white">
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/components/SecurityTile.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<button
on:click={() => onClick()}
class="flex flex-col flex-wrap justify-between text-left rounded-xl px-3 py-3 bg-{color}-50 dark:bg-gray-900 dark:bg-opacity-50 {classes}">
class="flex flex-col flex-wrap text-left rounded-xl px-3 py-3 bg-{color}-50 dark:bg-gray-900 dark:bg-opacity-50 {classes}">
<Icon boxed {icon} classes="text-white" boxClasses="mb-2 bg-{color}-600" />
<div>
<Text>{title}</Text>
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/routes/dashboard/wallet/views/Account.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<!-- wait for account to load -->
{#if $accounts && $account}
<div class="w-full h-full flex flex-col flex-nowrap px-10 pb-10 relative flex-1 bg-gray-50 dark:bg-gray-900">
<div class="w-full h-full flex flex-col flex-nowrap px-10 pb-5 relative flex-1 bg-gray-50 dark:bg-gray-900">
<AccountNavigation {locale} accounts={navAccounts} />
{#key $account}
<div class="w-full h-full grid grid-cols-3 gap-x-4 min-h-0">
Expand Down
8 changes: 4 additions & 4 deletions packages/shared/routes/dashboard/wallet/views/Receive.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,20 @@
{/if}
<div
class="w-full h-full flex flex-col flex-auto rounded-2xl border border-solid border-gray-300 dark:border-gray-700 p-4">
<div class="w-full flex flex-row justify-between items-start">
<Text type="p" smaler bold classes="mb-4">{locale('actions.receive')}</Text>
<div class="w-full flex flex-row justify-between items-center mb-1">
<Text type="p" smaller bold>{locale('actions.receive')}</Text>
<button on:click={generateNewAddress} class:pointer-events-none={isGeneratingAddress}>
<Icon icon="refresh" classes="{isGeneratingAddress && 'animate-spin'} text-gray-500 dark:text-white" />
</button>
</div>
<div class="flex flex-auto items-center justify-center mb-6">
<div class="flex flex-auto items-center justify-center mb-4">
<QR size={98} data={selectedAccount.depositAddress} />
</div>
<div class="mb-6">
<Text secondary smaller classes="mb-1">{locale('general.myAddress')}</Text>
<Text type="pre">{selectedAccount.depositAddress}</Text>
</div>
<Button disabled={isGeneratingAddress} classes="w-full" onClick={() => setClipboard(selectedAccount.depositAddress)}>
<Button small disabled={isGeneratingAddress} classes="w-full" onClick={() => setClipboard(selectedAccount.depositAddress)}>
{locale('general.copyAddress')}
</Button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/routes/dashboard/wallet/views/Security.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
onDestroy(unsubscribe)
</script>

<div data-label="security" class="p-8 flex-grow flex flex-col">
<Text type="h4" classes="mb-5">{locale('general.security')}</Text>
<div data-label="security" class="py-6 px-8 flex-grow flex flex-col">
<Text type="p" bold classes="mb-5">{locale('general.security')}</Text>
<div class="grid grid-cols-2 gap-2">
<!-- Firefly version -->
<SecurityTile
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/routes/dashboard/wallet/views/WalletBalance.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
const balance = getContext<Readable<BalanceOverview>>('walletBalance')
</script>

<div class="bg-gradient-to-b from-{color}-500 to-{color}-600 dark:from-gray-800 dark:to-gray-900 rounded-t-2xl pt-10 pb-12 px-8">
<div class="bg-gradient-to-b from-{color}-500 to-{color}-600 dark:from-gray-800 dark:to-gray-900 rounded-t-2xl pt-6 pb-10 px-8">
<!-- Balance -->
<div data-label="total-balance">
<Text type="p" overrideColor smaller classes="text-white mb-2">{locale('general.totalBalance')}</Text>
Expand All @@ -21,7 +21,7 @@
</div>
{#if $walletRoute === WalletRoutes.Init}
<!-- Incoming/Outgoing -->
<div data-label="total-movements" class="flex flex-row justify-between mt-10">
<div data-label="total-movements" class="flex flex-row justify-between mt-8">
<div class="flex items-center">
<Icon boxed icon="chevron-down" classes="text-white" boxClasses="bg-{color}-300 dark:bg-gray-900 mr-4" />
<div>
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/routes/dashboard/wallet/views/WalletHistory.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
}
</script>

<div data-label="latest-transactions" class="h-full p-8 flex-grow flex flex-col">
<div data-label="latest-transactions" class="h-full py-6 px-8 flex-grow flex flex-col">
<div class="w-full flex flex-row justify-between items-start">
<Text type="p" smaler bold classes="mb-5">{locale('general.latestTransactions')}</Text>
<Text type="p" bold classes="mb-5">{locale('general.latestTransactions')}</Text>
<button on:click={syncAccounts} class:pointer-events-none={$isSyncing}>
<Icon icon="refresh" classes="{$isSyncing && 'animate-spin'} text-gray-500 dark:text-white" />
</button>
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/routes/setup/backup/views/RecoveryPhrase.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
{locale('actions.continue')}
</Button>
</div>
<div slot="rightpane" class="w-full h-full flex flex-col flex-wrap items-center justify-center p-16">
<div slot="rightpane" class="w-full h-full flex flex-col items-center justify-center p-4">
{#if mnemonic !== undefined && mnemonic !== null}
<RecoveryPhrase classes="mb-8" recoveryPhrase={mnemonic} {hide} />
<Button onClick={handleMnemonicVisibilityClick}>
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/routes/setup/backup/views/VerifyRecoveryPhrase.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
{:else}{locale('actions.verifyRecoveryPhrase')}{/if}
</Button>
</div>
<div slot="rightpane" class="w-full h-full flex flex-col flex-wrap items-center justify-center p-16">
<div slot="rightpane" class="w-full h-full flex flex-col items-center justify-center p-4">
<RecoveryPhrase
classes="mb-8"
recoveryPhrase={mnemonic}
Expand Down