Skip to content

Commit

Permalink
Merge pull request #58 from thebrandonlucas/missing-hamburger-icon
Browse files Browse the repository at this point in the history
UI Fixes
  • Loading branch information
DanGould authored Jan 26, 2024
2 parents 95528ae + 41fb2f4 commit 9f84172
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/components/Header/H2.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
export let colorClass = 'text-white';
</script>

<h2 class={`text-6xl my-4 ${colorClass} ${$$props.class}`}><slot /></h2>
<h2 class={`text-center text-6xl my-4 ${colorClass} ${$$props.class}`}><slot /></h2>
2 changes: 1 addition & 1 deletion src/components/Icon/Icon.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
export let name: IconName;
</script>

<span class={` ${$$props.class || 'inline-flex h-6 text-primary'}`}>
<span class={` ${$$props.class || 'inline-flex h-6 w-6 text-primary'}`}>
<!-- NOTE: if we don't know the source of the data, using @html can lead to XSS attacks.
In this case, we know the data is safe because it's an SVG in our repo -->
<!-- eslint-disable-next-line svelte/no-at-html-tags -->
Expand Down
4 changes: 2 additions & 2 deletions src/components/LinkTag.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<a
{href}
class={`${
bad ? 'bg-orange-100 cursor-text' : 'bg-green-100'
} no-underline rounded-xl px-3 p-2 hover:scale-105 transition-all duration-200 ease-in-out`}
bad ? 'bg-orange-100' : 'bg-green-100'
} no-underline rounded-xl cursor-pointer px-3 p-2 hover:scale-105 transition-all duration-200 ease-in-out`}
target="_blank"
rel="noreferrer noopener"
>
Expand Down
2 changes: 1 addition & 1 deletion src/features/Footer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</script>

<footer
class="bg-secondary px-4 w-full flex flex-wrap sm:justify-evenly sm:items-start sm:flex-row gap-8 sm:gap-12 sm:py-16 py-4 text-white"
class="bg-secondary px-4 w-full flex flex-wrap sm:justify-evenly items-start justify-center sm:flex-row gap-8 sm:gap-12 sm:py-16 py-4 text-white"
>
<div class="flex flex-col">
<strong>Learn</strong>
Expand Down
2 changes: 1 addition & 1 deletion src/features/Nav.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</h3>

<button class="flex items-center" on:click={handleOpen}>
<Icon class="flex h-6 text-white" name="hamburger" />
<Icon class="flex h-6 w-6 text-white" name="hamburger" />
</button>
</div>
{:else}
Expand Down
10 changes: 5 additions & 5 deletions src/routes/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<script lang="ts">
import Icon from '@components/Icon/Icon.svelte';
import H1 from '@components/Header/H1.svelte';
import H2 from '@components/Header/H2.svelte';
import Button from '@components/Button.svelte';
import Card from '@components/Card.svelte';
import Link from '@components/Link.svelte';
import { WALLET_ADOPTION } from '@/lib/constants';
import WalletCard from '@features/WalletCard.svelte';
import H3 from '@/components/Header/H3.svelte';
import H2 from '@/components/Header/H2.svelte';
const privateWallets = WALLET_ADOPTION.filter((wallet) => wallet.sending || wallet.sending);
const surveillableWallets = WALLET_ADOPTION.filter(
Expand Down Expand Up @@ -62,7 +62,7 @@ If there is a wallet you’d like to see adopt payjoin or you are a wallet devel
class="bg-tertiary w-full flex flex-col gap-4 sm:gap-14 items-center py-16"
>
<H2>Why Payjoin?</H2>
<div class="flex flex-col sm:flex-row sm:gap-12 gap-4 w-3/4">
<div class="flex flex-col lg:flex-row sm:gap-12 gap-4 w-3/4">
<Card>
<div class="flex flex-col gap-2 text-white">
<h3 class="font-bold">Preserve Privacy</h3>
Expand Down Expand Up @@ -112,10 +112,10 @@ If there is a wallet you’d like to see adopt payjoin or you are a wallet devel
>
<H2>Wallets Using Payjoin</H2>
<div
class="flex flex-col sm:flex-row max-sm:py-4 gap-8 w-full bg-tertiary justify-center items-center"
class="flex flex-col xl:flex-row max-xl:py-4 gap-8 w-full bg-tertiary justify-center items-center"
>
<a href="https://bitmask.app"
><img src="/images/bitmask.svg" alt="bitmasklogo" class="max-w-[200px]" /></a
><img src="/images/bitmask.svg" alt="bitmasklogo" class="max-w-[200px] w-full h-full" /></a
>
<a href="https://bluewallet.io"><img src="/images/bluewallet.svg" alt="bluewallet logo" /></a>
<a href="https://btcpayserver.org"><img src="/images/btcpay.svg" alt="btcpayserver logo" /></a>
Expand All @@ -127,7 +127,7 @@ If there is a wallet you’d like to see adopt payjoin or you are a wallet devel
>
<a href="https://wasabiwallet.app"><img src="/images/wasabi.svg" alt="wasabi logo" /></a>
</div>
<div class="flex sm:flex-row flex-col gap-8 w-3/4">
<div class="flex xl:flex-row flex-col gap-8 w-3/4">
<div class="flex flex-col gap-2 w-full items-center">
<H3 class="flex gap-4 items-center sm:flex-row flex-col"
><Icon name="check" class="text-green-400 w-8 sm:w-4" />Supports Payjoin</H3
Expand Down
2 changes: 1 addition & 1 deletion static/images/bitmask.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9f84172

Please sign in to comment.