fix: change appearance of top section buttons

This commit is contained in:
afn 2023-03-07 03:26:16 -05:00
parent 9a0ca6ebaa
commit 3f441ac6f8
5 changed files with 42 additions and 22 deletions

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFB1C5"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M16 9v10H8V9h8m-1.5-6h-5l-1 1H5v2h14V4h-3.5l-1-1zM18 7H6v12c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7z"/></svg>

After

Width:  |  Height:  |  Size: 252 B

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFB1C5"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 17h-2v-2h2v2zm2.07-7.75l-.9.92C13.45 12.9 13 13.5 13 15h-2v-.5c0-1.1.45-2.1 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41 0-1.1-.9-2-2-2s-2 .9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 .88-.36 1.68-.93 2.25z"/></svg>

After

Width:  |  Height:  |  Size: 427 B

View File

@ -47,6 +47,13 @@
gap: 0.5rem; gap: 0.5rem;
} }
.button-icon {
background-color: transparent;
height: 24px;
width: 24px;
padding: 0;
}
.button-primary { .button-primary {
background-color: #ffb1c5; background-color: #ffb1c5;
box-shadow: 0px 0px 32px 1px var(--accent-color-glow); box-shadow: 0px 0px 32px 1px var(--accent-color-glow);

View File

@ -80,6 +80,7 @@
left: 0; left: 0;
width: 100%; width: 100%;
background-color: var(--grey-six); background-color: var(--grey-six);
margin-bottom: 16px;
} }
.modal { .modal {

View File

@ -9,6 +9,9 @@
import Button from '$lib/components/atoms/Button.svelte'; import Button from '$lib/components/atoms/Button.svelte';
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';
import questionMark from '$lib/assets/icons/help.svg';
import trash from '$lib/assets/icons/delete.svg';
interface Selected { interface Selected {
[key: string]: string[]; [key: string]: string[];
} }
@ -97,17 +100,17 @@
// update ui // update ui
logos = logos; logos = logos;
if (location.hash !== '') { // if (location.hash !== '') {
try { // try {
await exchange_token(location.hash.substring(1)); // await exchange_token(location.hash.substring(1));
} catch (err) { // } catch (err) {
alert(`Could not exchange the token: ${err}`); // alert(`Could not exchange the token: ${err}`);
} // }
} else if (localStorage.getItem('killswitch') === null) { // } else if (localStorage.getItem('killswitch') === null) {
await goto('/poll/unauthorized/'); // await goto('/poll/unauthorized/');
} else { // } else {
alert('Warning: no token!'); // alert('Warning: no token!');
} // }
}); });
function previousPage() { function previousPage() {
@ -219,14 +222,16 @@
<main> <main>
<div class="wrapper"> <div class="wrapper">
<div class="top-container"> <div class="top-container">
<h3>ReVanced</h3> <div class="top-container-text">
<h1>{finalPage ? 'Review selected logos' : 'Select logos'}</h1> <h3>ReVanced</h3>
<h2> <h1>{finalPage ? 'Review selected logos' : 'Select logos'}</h1>
{ui_selected_count}/{logos.length} selected · Page {currentPage + 1}/{logoPages} <h2>
</h2> {ui_selected_count}/{logos.length} selected · Page {currentPage + 1}/{logoPages}
</h2>
</div>
<div class="top-custom-button-container"> <div class="top-custom-button-container">
<button on:click={() => (modalOpen = !modalOpen)}>How does this work?</button> <Button on:click={() => (modalOpen = !modalOpen)} kind="icon" icon={questionMark}></Button>
<button on:click={clearLogos}>Clear All</button> <Button on:click={clearLogos} kind="icon" icon={trash}></Button>
</div> </div>
</div> </div>
@ -407,20 +412,25 @@
} }
.top-container { .top-container {
display: flex;
flex-direction: column;
gap: 0.5rem;
margin-bottom: 2rem; margin-bottom: 2rem;
background-color: var(--accent-color); background-color: var(--accent-color);
padding: 2rem; padding: 2rem;
border-radius: 20px; border-radius: 20px;
display: flex;
justify-content: space-between;
}
.top-container-text{
display: flex;
flex-direction: column;
gap: 0.5rem;
} }
.top-custom-button-container { .top-custom-button-container {
margin-top: 0.5rem; margin-top: 0.5rem;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
gap: 0.5rem; gap: 0.75rem;
} }
.warning { .warning {