Skip to content
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.

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

feat(bridge-ui-v2): Style adjustments #14350

Merged
merged 2 commits into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/bridge-ui-v2/src/components/Bridge/Amount.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import type { FetchBalanceResult } from '@wagmi/core';
import { onMount } from 'svelte';

Check warning on line 3 in packages/bridge-ui-v2/src/components/Bridge/Amount.svelte

View workflow job for this annotation

GitHub Actions / build

'onMount' is defined but never used
import { t } from 'svelte-i18n';
import { formatUnits, parseUnits } from 'viem';

Expand Down Expand Up @@ -240,7 +240,7 @@
error={$insufficientBalance}
on:input={inputAmount}
bind:this={inputBox}
class="w-full input-box outline-none py-6 pr-16 px-[26px] title-subsection-bold placeholder:text-tertiary-content" />
class="py-6 pr-16 px-[26px] title-subsection-bold" />
<!-- TODO: talk to Jane about the MAX button and its styling -->
<button
class="absolute right-6 uppercase hover:font-bold"
Expand Down
4 changes: 2 additions & 2 deletions packages/bridge-ui-v2/src/components/Bridge/Bridge.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@
}
</script>

<Card class="md:w-[524px]" title={$t('bridge.title.default')} text={$t('bridge.description')}>
<Card class="w-full md:w-[524px]" title={$t('bridge.title.default')} text={$t('bridge.description')}>
<div class="space-y-[35px]">
<div class="f-between-center gap-4">
<ChainSelector class="flex-1" value={$network} switchWallet />
<ChainSelector class="flex-1 " value={$network} switchWallet />

<SwitchChainsButton />

Expand Down
15 changes: 9 additions & 6 deletions packages/bridge-ui-v2/src/components/Bridge/BridgeTabs.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@

import { page } from '$app/stores';
import { LinkButton } from '$components/LinkButton';
$: isERC20Bridge = $page.route.id === '/' ? true : false;
$: isNFTBridge = $page.route.id === '/nft' ? true : false;
$: classes = `flex-basis-0 mr-2 p-3 rounded-full flex justify-center items-center w-auto sm:w-20 2xl:w-32`;
import { classNames } from '$libs/util/classNames';

let classes = classNames('space-x-2', $$props.class);

$: isERC20Bridge = $page.route.id === '/';
KorbinianK marked this conversation as resolved.
Show resolved Hide resolved
$: isNFTBridge = $page.route.id === '/nft';
</script>

<div class="flex w-full ml-2">
<LinkButton class={classes} href="/" active={isERC20Bridge}>
<div class={classes}>
<LinkButton class="py-2 px-[20px]" href="/" active={isERC20Bridge}>
<span> {$t('nav.token')}</span>
</LinkButton>

<LinkButton class={classes} href="/nft" active={isNFTBridge}>
<LinkButton class="py-2 px-[20px]" href="/nft" active={isNFTBridge}>
<span> {$t('nav.nft')}</span>
</LinkButton>
</div>
4 changes: 2 additions & 2 deletions packages/bridge-ui-v2/src/components/Bridge/Recipient.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
let dialogId = `dialog-${uid()}`;

let modalOpen = false;
let invalidAddress = false; // TODO: will be used soon

Check warning on line 18 in packages/bridge-ui-v2/src/components/Bridge/Recipient.svelte

View workflow job for this annotation

GitHub Actions / build

'invalidAddress' is assigned a value but never used
let prevRecipientAddress: Maybe<Address> = null;

let inputBox: InputBox;
Expand Down Expand Up @@ -69,11 +69,11 @@
$: displayedRecipient = $recipientAddress || $account?.address;
</script>

<div class="Recipient">
<div class="Recipient f-col space-y-2">
<div class="f-between-center">
<div class="flex space-x-2">
<span class="body-small-bold text-primary-content">{$t('recipient.title')}</span>
<Tooltip>TODO: add description about processing fee</Tooltip>
<Tooltip>{$t('recipient.tooltip')}</Tooltip>
</div>
<button class="link" on:click={openModal} on:focus={openModal}>{$t('common.edit')}</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</script>

<button
class="f-center rounded-full bg-secondary-icon w-[30px] h-[30px]"
class="f-center rounded-full bg-secondary-icon w-[30px] h-[30px] hover:bg-primary-interactive-hover"
disabled={!$destNetwork}
on:click={switchToDestChain}>
<Icon type="up-down" class="rotate-90" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { type Chain, type GetNetworkResult, switchNetwork } from '@wagmi/core';
import { type ComponentType,onDestroy } from 'svelte';
import { type ComponentType, onDestroy } from 'svelte';
import { t } from 'svelte-i18n';
import { UserRejectedRequestError } from 'viem';

Expand All @@ -25,6 +25,8 @@
small ? 'px-2 py-[6px]' : 'px-6 py-[10px]',
small ? 'rounded-md' : 'rounded-[10px]',
small ? 'w-auto' : 'w-full',
readOnly ? '' : 'hover:bg-primary-interactive-hover',
'flex justify-start content-center body-bold py-2 px-[20px]',
);

let chainToIconMap: Record<string, ComponentType> = {
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge-ui-v2/src/components/Faucet/Faucet.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
$: updateMintButtonState(selectedToken, $network);
</script>

<Card class="md:w-[524px]" title={$t('faucet.title')} text={$t('faucet.description')}>
<Card class="w-full md:w-[524px]" title={$t('faucet.title')} text={$t('faucet.description')}>
<div class="space-y-[35px]">
<div class="space-y-2">
<ChainSelector label={$t('chain_selector.currently_on')} value={$network} switchWallet small />
Expand Down
20 changes: 12 additions & 8 deletions packages/bridge-ui-v2/src/components/Header/Header.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import { LogoWithText } from '$components/Logo';
import { drawerToggleId } from '$components/SideNavigation';
import { account } from '$stores/account';

$: isBridgePage = $page.route.id === '/' || $page.route.id === '/nft';
</script>

Expand All @@ -24,17 +25,20 @@
md:px-10
md:py-7
">
<LogoWithText class="w-[77px] h-[20px] md:hidden" />
<LogoWithText width={150} height={50} class="md:hidden" />

{#if isBridgePage}
<BridgeTabs />
{:else}
<div />
{/if}
<div class="flex justify-end md:f-between-center w-full">
{#if isBridgePage}
<!-- TODO: show tabs on mobile somewhere else -->
<BridgeTabs class="hidden md:flex" />
{:else}
<div></div>
{/if}

<ConnectButton connected={$account?.isConnected} />
<ConnectButton connected={$account?.isConnected} />
</div>

<label for={drawerToggleId} class="md:hidden">
<label for={drawerToggleId} class="ml-[10px] md:hidden">
<Icon type="bars-menu" />
</label>
</header>
16 changes: 16 additions & 0 deletions packages/bridge-ui-v2/src/components/Icon/Icon.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
| 'plus-circle'
| 'circle'
| 'arrow-right'
| 'arrow-left'
| 'arrow-top-right'
| 'up-down'
| 'check'
| 'trash';
Expand Down Expand Up @@ -144,6 +146,20 @@
fill-rule="evenodd"
clip-rule="evenodd"
d="M3 10C3 9.58579 3.33579 9.25 3.75 9.25L14.3879 9.25L10.2302 5.29062C9.93159 5.00353 9.92228 4.52875 10.2094 4.23017C10.4965 3.93159 10.9713 3.92228 11.2698 4.20937L16.7698 9.45937C16.9169 9.60078 17 9.79599 17 10C17 10.204 16.9169 10.3992 16.7698 10.5406L11.2698 15.7906C10.9713 16.0777 10.4965 16.0684 10.2094 15.7698C9.92228 15.4713 9.93159 14.9965 10.2302 14.7094L14.3879 10.75L3.75 10.75C3.33579 10.75 3 10.4142 3 10Z" />
{:else if type === 'arrow-left'}
<path
class={fillClass}
fill-rule="evenodd"
clip-rule="evenodd"
d="M17 10c0 0.4142 -0.33579 0.75 -0.75 0.75h-10.6379l4.1577 3.95938c0.29861 0.28691 0.30792 0.76169 0.02083 1.06027c-0.28691 0.29861 -0.76169 0.30792 -1.06027 0.02083l-5.5 -5.25c-0.14691 -0.14122 -0.23 -0.33642 -0.23 -0.54062c0 -0.20401 0.08309 -0.39922 0.23 -0.54062l5.5 -5.25c0.29861 -0.28691 0.77339 -0.29622 1.06027 -0.02083c0.28691 0.29861 0.2776 0.77339 -0.02083 1.06027l-4.1577 3.95938h10.6379c0.4142 0 0.75 0.33579 0.75 0.75z" />
{:else if type === 'arrow-top-right'}
<g transform="rotate(-45 8 8)">
<path
class={fillClass}
fill-rule="evenodd"
clip-rule="evenodd"
d="M3 10C3 9.58579 3.33579 9.25 3.75 9.25L14.3879 9.25L10.2302 5.29062C9.93159 5.00353 9.92228 4.52875 10.2094 4.23017C10.4965 3.93159 10.9713 3.92228 11.2698 4.20937L16.7698 9.45937C16.9169 9.60078 17 9.79599 17 10C17 10.204 16.9169 10.3992 16.7698 10.5406L11.2698 15.7906C10.9713 16.0777 10.4965 16.0684 10.2094 15.7698C9.92228 15.4713 9.93159 14.9965 10.2302 14.7094L14.3879 10.75L3.75 10.75C3.33579 10.75 3 10.4142 3 10Z" />
</g>
{:else if type === 'up-down'}
<path
class={fillClass}
Expand Down
12 changes: 10 additions & 2 deletions packages/bridge-ui-v2/src/components/InputBox/InputBox.svelte
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
<script lang="ts">
import { onMount } from 'svelte';

Check warning on line 2 in packages/bridge-ui-v2/src/components/InputBox/InputBox.svelte

View workflow job for this annotation

GitHub Actions / build

'onMount' is defined but never used

import { classNames } from '$libs/util/classNames';

export let loading = false;
export let error = false;

let input: HTMLInputElement;
let classes = classNames('w-full input-box placeholder:text-tertiary-content', $$props.class);

let { class: restClass = '', ...restProps } = $$restProps;
let classes = classNames(
'w-full input-box placeholder:text-tertiary-content bg-neutral-background border-0 shadow-none outline-none font-bold text-2xl',
restClass,
error ? 'error' : '',
);

// Public API
export const getValue = () => input.value;
Expand All @@ -14,4 +22,4 @@
export const focus = () => input.focus();
</script>

<input class={classes} class:error disabled={loading} {...$$restProps} bind:this={input} on:input on:blur />
<input class={classes} disabled={loading} {...restProps} bind:this={input} on:input on:blur />
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script lang="ts">
import { Icon } from '$components/Icon';
import { classNames } from '$libs/util/classNames';

export let active = false;
Expand All @@ -15,4 +16,7 @@
target={external ? '_blank' : null}
class={classNames('p-3 rounded-full flex justify-start content-center', activeClass, $$props.class)}>
<slot />
{#if external}
<Icon type="arrow-top-right" flillClass="fill-white" />
{/if}
</a>
2 changes: 1 addition & 1 deletion packages/bridge-ui-v2/src/components/Page/Page.svelte
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="f-center w-full px-4 md:px-10 py-[50px] md:py-[60px]">
<div class="f-center w-full md:px-10 md:py-[60px]">
<slot />
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

let drawerToggleElem: HTMLInputElement;

$: isBridgePage = $page.route.id === '/';
$: isBridgePage = $page.route.id === '/' || $page.route.id === '/nft';
$: isFaucetPage = $page.route.id === '/faucet';
$: isActivitiesPage = $page.route.id === '/activities';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
aria-haspopup="listbox"
aria-controls={id}
aria-expanded={menuOpen}
class="f-between-center w-full px-6 py-[14px] input-box"
class="f-between-center w-full px-6 py-[14px] input-box bg-neutral-background border-0 shadow-none outline-none font-bold text-2xl"
on:click={openMenu}
on:focus={openMenu}>
<div class="space-x-2">
Expand Down
Loading