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: login screen minor changes #1799

Merged
merged 5 commits into from
Feb 2, 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
38 changes: 31 additions & 7 deletions frontend/src/lib/components/login/LoginFooter.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<script lang="ts">
import { i18n } from "$lib/stores/i18n";
import { BREAKPOINT_LARGE, IconGitHub } from "@dfinity/gix-components";
import {
BREAKPOINT_EXTRA_LARGE,
IconGitHub,
IconNorthEast,
} from "@dfinity/gix-components";
import MenuMetrics from "$lib/components/common/MenuMetrics.svelte";

export let presentation: "footer" | "menu" = "footer";
Expand All @@ -10,7 +14,9 @@

// See comment in <LoginHeader />
$: displayTvl =
innerWidth > 0 && innerWidth <= BREAKPOINT_LARGE && presentation === "menu";
innerWidth > 0 &&
innerWidth <= BREAKPOINT_EXTRA_LARGE &&
presentation === "menu";
</script>

<svelte:window bind:innerWidth />
Expand All @@ -25,7 +31,14 @@
</div>
{/if}

<span class="copyright">{$i18n.auth.copyright}</span>
<a
class="ic"
href="https://internetcomputer.org"
rel="noopener noreferrer"
target="_blank"
alt={$i18n.auth.internetcomputer_dot_org_link}
><span>internetcomputer.org</span> <IconNorthEast /></a
>

<a
class="github"
Expand Down Expand Up @@ -54,7 +67,18 @@

:global(svg) {
vertical-align: bottom;
margin-right: var(--padding);
}

&.ic {
:global(svg) {
margin-left: var(--padding);
}
}

&.github {
:global(svg) {
margin-right: var(--padding);
}
}

&:active,
Expand All @@ -67,7 +91,7 @@
.footer {
display: none;

@include media.min-width(large) {
@include media.min-width(xlarge) {
display: flex;
justify-content: space-between;

Expand All @@ -85,9 +109,9 @@
position: relative;

display: flex;
flex-direction: column-reverse;
flex-direction: column;

.copyright {
.github {
padding: var(--padding) var(--padding-3x);
font-size: var(--font-size-small);
@include text.truncate;
Expand Down
14 changes: 7 additions & 7 deletions frontend/src/lib/components/login/LoginHeader.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import {
BREAKPOINT_LARGE,
BREAKPOINT_EXTRA_LARGE,
ExternalLink,
MenuButton,
ThemeToggle,
Expand All @@ -15,7 +15,7 @@

// We have to use JS to activate the TVL metrics in the header or menu to avoid to make calls twice
// Easier than introducing stores and logic at this point since this can only happen on the login screen.
$: displayTvl = innerWidth > BREAKPOINT_LARGE && ENABLE_TVL;
$: displayTvl = innerWidth > BREAKPOINT_EXTRA_LARGE && ENABLE_TVL;
</script>

<svelte:window bind:innerWidth />
Expand All @@ -38,8 +38,8 @@
/>

<div class="end">
<ExternalLink href="https://internetcomputer.org/nns"
>{$i18n.auth.about}</ExternalLink
<ExternalLink href="https://dashboard.internetcomputer.org/"
>{$i18n.auth.dashboard}</ExternalLink
>
<ExternalLink href="https://dashboard.internetcomputer.org/governance"
>{$i18n.auth.voting_rewards}</ExternalLink
Expand Down Expand Up @@ -67,7 +67,7 @@

padding: 0 var(--padding-2x);

@include media.min-width(large) {
@include media.min-width(xlarge) {
padding: 0 var(--padding-8x);
}

Expand Down Expand Up @@ -108,7 +108,7 @@
.logo-nns {
height: var(--padding-6x);

@include media.min-width(large) {
@include media.min-width(xlarge) {
padding-top: var(--padding);
}

Expand All @@ -131,7 +131,7 @@
display: none;
}

@include media.min-width(large) {
@include media.min-width(xlarge) {
:global(a) {
display: inline-block;

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lib/components/login/LoginMenuItems.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

<div class="menu-items">
<MenuItem
href="https://internetcomputer.org/nns"
href="https://dashboard.internetcomputer.org/"
rel="noopener noreferrer"
target="_blank"
>
<span>{$i18n.auth.about} <IconNorthEast /></span>
<span>{$i18n.auth.dashboard} <IconNorthEast /></span>
</MenuItem>

<MenuItem
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/lib/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@
"earn": "Vote & earn rewards",
"launchpad": "SNS Launch Pad",
"ic_logo": "Internet Computer logo",
"about": "About",
"dashboard": "Dashboard",
"voting_rewards": "Voting rewards",
"logo": "Network Nervous System logo",
"copyright": "© 2023 Internet Computer",
"github_link": "Link to NNS-dapp repo on GitHub",
"background": "An abstract image for design and presentation purpose only"
"background": "An abstract image for design and presentation purpose only",
"internetcomputer_dot_org_link": "Link to internetcomputer.org"
},
"accounts": {
"main": "Main",
Expand Down Expand Up @@ -765,7 +765,7 @@
"5": "The proposal was adopted, but execution failed."
},
"metrics": {
"tvl": "Total Value Locked"
"tvl": "Total ICP Value Locked"
},
"ckbtc": {
"title": "ckBTC",
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/lib/types/i18n.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@ interface I18nAuth {
earn: string;
launchpad: string;
ic_logo: string;
about: string;
dashboard: string;
voting_rewards: string;
logo: string;
copyright: string;
github_link: string;
background: string;
internetcomputer_dot_org_link: string;
}

interface I18nAccounts {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/routes/(login)/+layout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

padding: 0;

@include media.min-width(large) {
@include media.min-width(xlarge) {
padding: 0 0 var(--login-footer-offset);
}
}
Expand Down