fix various design divergences

This commit is contained in:
pierre
2024-01-10 17:52:10 +01:00
parent 28f118c73b
commit cfa9ecfcc4
24 changed files with 153 additions and 162 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-93
View File
@@ -1,93 +0,0 @@
Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
@@ -0,0 +1,48 @@
Copyright (c) 2010-2014, Łukasz Dziedzic (dziedzic@typoland.com),
with Reserved Font Name Lato.
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+12 -16
View File
@@ -9,33 +9,29 @@ function ConnectionStatus() {
const { t } = useTranslation('home');
const statusBadgeDynStyles = {
Connected: [
'bg-blanc-nacre-icicle',
'text-vert-menthe',
'dark:bg-baltic-sea-quartzite',
],
Connected: ['text-vert-menthe', 'bg-vert-prasin bg-opacity-10'],
Disconnected: [
'bg-blanc-nacre-platinum',
'bg-cement-feet bg-opacity-10',
'text-coal-mine-light',
'dark:bg-baltic-sea-oil',
'dark:bg-oil dark:bg-opacity-15',
'dark:text-coal-mine-dark',
],
Connecting: [
'bg-blanc-nacre-platinum',
'bg-cement-feet bg-opacity-10',
'text-baltic-sea',
'dark:bg-baltic-sea-oil',
'dark:bg-oil dark:bg-opacity-15',
'dark:text-white',
],
Disconnecting: [
'bg-blanc-nacre-platinum',
'bg-cement-feet bg-opacity-10',
'text-baltic-sea',
'dark:bg-baltic-sea-oil',
'dark:bg-oil dark:bg-opacity-15',
'dark:text-white',
],
Unknown: [
'bg-blanc-nacre-platinum',
'bg-cement-feet bg-opacity-10',
'text-coal-mine-light',
'dark:bg-baltic-sea-oil',
'dark:bg-oil dark:bg-opacity-15',
'dark:text-coal-mine-dark',
],
};
@@ -60,7 +56,7 @@ function ConnectionStatus() {
<div
className={clsx([
...statusBadgeDynStyles[state.state],
'font-bold py-4 px-6 rounded-full text-lg',
'text-lg font-bold py-3 px-6 rounded-full',
])}
>
{getStatusText(state.state)}
@@ -69,7 +65,7 @@ function ConnectionStatus() {
<div className="w-full flex flex-col flex-1 items-center overflow-hidden">
{state.loading && state.progressMessages.length > 0 && !state.error && (
<div className="w-4/5 h-2/3 overflow-scroll break-words text-center">
<p className="text-dim-gray dark:text-mercury-mist font-bold">
<p className="text-sm text-dim-gray dark:text-mercury-mist font-bold">
{t(
`connection-progress.${
state.progressMessages[state.progressMessages.length - 1]
@@ -84,7 +80,7 @@ function ConnectionStatus() {
{state.state === 'Connected' && <ConnectionTimer />}
{state.error && (
<div className="w-4/5 h-2/3 overflow-scroll break-words text-center">
<p className="text-teaberry font-bold">{state.error}</p>
<p className="text-sm text-teaberry font-bold">{state.error}</p>
</div>
)}
</div>
@@ -27,11 +27,11 @@ function ConnectionTimer() {
}, [sessionStartDate]);
return (
<div className="flex flex-col items-center">
<p className="font-bold text-dim-gray dark:text-mercury-mist">
<div className="flex flex-col items-center gap-2">
<p className="text-sm font-bold text-dim-gray dark:text-mercury-mist">
{t('connection-time')}
</p>
<p className="font-bold text-baltic-sea dark:text-white">
<p className="text-sm font-bold text-baltic-sea dark:text-flawed-white">
{connectionTime}
</p>
</div>
+19 -17
View File
@@ -79,36 +79,38 @@ function Home() {
<div className="flex grow flex-col justify-between gap-y-6">
<div className="flex flex-col justify-between gap-y-4">
<NetworkModeSelect />
<div className="flex flex-col gap-4">
<div className="mt-3 font-semibold text-lg">
<div className="flex flex-col gap-6">
<div className="mt-3 text-base font-semibold">
{t('select-node-title')}
</div>
{entrySelector && (
<div className="flex flex-col gap-5">
{entrySelector && (
<HopSelect
country={entryNodeLocation || defaultNodeLocation}
onClick={() => {
if (state === 'Disconnected') {
navigate(routes.entryNodeLocation);
}
}}
nodeHop="entry"
/>
)}
<HopSelect
country={entryNodeLocation || defaultNodeLocation}
country={exitNodeLocation || defaultNodeLocation}
onClick={() => {
if (state === 'Disconnected') {
navigate(routes.entryNodeLocation);
navigate(routes.exitNodeLocation);
}
}}
nodeHop="entry"
nodeHop="exit"
/>
)}
<HopSelect
country={exitNodeLocation || defaultNodeLocation}
onClick={() => {
if (state === 'Disconnected') {
navigate(routes.exitNodeLocation);
}
}}
nodeHop="exit"
/>
</div>
</div>
</div>
<Button
className={clsx([
'flex justify-center items-center',
'rounded-lg text-lg font-bold py-4 px-6 h-16',
'rounded-lg text-lg font-bold py-3 px-6',
'focus:outline-none focus:ring-4 focus:ring-black focus:dark:ring-white shadow',
(state === 'Disconnected' || state === 'Connecting') &&
'bg-melon text-white dark:text-baltic-sea',
+2 -2
View File
@@ -32,8 +32,8 @@ export default function HopSelect({
>
<div
className={clsx([
'absolute left-3 -top-3 px-1',
'bg-blanc-nacre dark:bg-baltic-sea text-sm',
'absolute left-3 -top-2.5 px-1',
'bg-blanc-nacre dark:bg-baltic-sea text-xs',
])}
>
{nodeHop === 'entry' ? t('first-hop') : t('last-hop')}
@@ -59,7 +59,7 @@ function NetworkModeSelect() {
<RadioGroup value={selected} onChange={handleSelect}>
<RadioGroup.Label
as="div"
className="font-semibold text-lg text-baltic-sea dark:text-white mb-5"
className="font-semibold text-base text-baltic-sea dark:text-white mb-6"
>
{t('select-network-label')}
</RadioGroup.Label>
@@ -70,7 +70,7 @@ function NetworkModeSelect() {
value={mode.name}
className={({ checked }) =>
clsx([
'bg-white dark:bg-baltic-sea-jaguar relative flex rounded-lg px-5 py-3 shadow-md focus:outline-none',
'bg-white dark:bg-baltic-sea-jaguar relative flex rounded-lg px-5 py-2 focus:outline-none',
(state.state !== 'Disconnected' || loading) &&
'cursor-not-allowed',
checked &&
@@ -88,7 +88,7 @@ function NetworkModeSelect() {
radio_button_checked
</span>
) : (
<span className="font-icon text-2xl text-mercury-pinkish">
<span className="font-icon text-2xl text-cement-feet dark:laughing-jack">
radio_button_unchecked
</span>
)}
@@ -96,13 +96,16 @@ function NetworkModeSelect() {
<div className="text-sm">
<RadioGroup.Label
as="p"
className="font-semibold text-lg text-baltic-sea dark:text-mercury-pinkish"
className={clsx([
'text-base text-baltic-sea dark:text-mercury-pinkish',
checked && 'font-semibold',
])}
>
{mode.title}
</RadioGroup.Label>
<RadioGroup.Description
as="span"
className="text-base text-cement-feet dark:text-mercury-mist"
className="text-sm text-cement-feet dark:text-mercury-mist"
>
<span>{mode.desc}</span>
</RadioGroup.Description>
+21 -6
View File
@@ -1,10 +1,13 @@
import { useTranslation } from 'react-i18next';
import clsx from 'clsx';
import { Country } from '../../types';
interface CountryListProps {
countries: Country[];
onClick: (name: string, code: string) => void;
isSelected: (code: string) => boolean;
}
export default function CountryList({
countries,
onClick,
@@ -12,28 +15,40 @@ export default function CountryList({
}: CountryListProps) {
const { t } = useTranslation('nodeLocation');
return (
<ul className="flex flex-col w-full items-stretch gap-4">
<ul className="flex flex-col w-full items-stretch gap-1">
{countries && countries.length > 0 ? (
countries.map((country) => (
<li key={country.code} className="list-none w-full">
<div
role="presentation"
onKeyDown={() => onClick(country.name, country.code)}
className="flex flex-row justify-between dark:hover:bg-gun-powder hover:dark:bg-opacity-80 hover:bg-cement-feet hover:bg-opacity-20 rounded-lg cursor-pointer px-3"
className={clsx([
'flex flex-row justify-between',
'hover:bg-gun-powder hover:bg-opacity-10',
'dark:hover:bg-laughing-jack dark:hover:bg-opacity-10',
'rounded-lg cursor-pointer px-3 py-1',
isSelected(country.code) &&
'bg-gun-powder dark:bg-laughing-jack bg-opacity-15 dark:bg-opacity-15',
])}
onClick={() => onClick(country.name, country.code)}
>
<div className="flex flex-row items-center m-1 gap-3 p-1 cursor-pointer">
<img
src={`./flags/${country.code.toLowerCase()}.svg`}
className="h-8"
className="h-6"
alt={country.code}
/>
<div className="flex items-center cursor-pointer">
<div className="flex items-center dark:text-mercury-pinkish text-base cursor-pointer">
{country.name}
</div>
</div>
<div className="p-4 flex items-center text-mercury-mist text-sm cursor-pointer">
{isSelected(country.code) ? t('selected') : ''}
<div
className={clsx([
'pr-4 flex items-center font-medium text-xs cursor-pointer',
'text-cement-feet dark:text-mercury-mist',
])}
>
{isSelected(country.code) && t('selected')}
</div>
</div>
</li>
@@ -74,7 +74,7 @@ function NodeLocation({ node }: { node: NodeHop }) {
onChange={filter}
placeholder={t('search-country')}
/>
<span className="mt-3" />
<span className="mt-2" />
<CountryList
countries={foundCountries}
onClick={handleCountrySelection}
@@ -14,13 +14,13 @@ export default function QuickConnect({ onClick }: QuickConnectProps) {
onKeyDown={() =>
onClick(defaultNodeLocation.name, defaultNodeLocation.code)
}
className="flex px-1 flex-row items-center w-full py-8 cursor-pointer"
className="flex px-1 flex-row items-center w-full py-5 cursor-pointer"
onClick={() =>
onClick(defaultNodeLocation.name, defaultNodeLocation.code)
}
>
<span className="font-icon text-2xl px-4 cursor-pointer">bolt</span>
<div className="cursor-pointer">{`${QuickConnectPrefix} (${defaultNodeLocation.name})`}</div>
<span className="font-icon text-2xl pl-3 pr-4 cursor-pointer">bolt</span>
<div className="cursor-pointer text-base">{`${QuickConnectPrefix} (${defaultNodeLocation.name})`}</div>
</div>
);
}
@@ -29,6 +29,15 @@ export default function SearchBox({
placeholder={placeholder}
onChange={onChange}
/>
<div
className={clsx([
'absolute left-7 -top-2 px-1',
'text-cement-feet dark:text-mercury-mist',
'bg-blanc-nacre dark:bg-baltic-sea text-xs',
])}
>
Search
</div>
<span
className={clsx([
'font-icon text-2xl absolute left-7',
+19 -9
View File
@@ -3,31 +3,41 @@
@tailwind utilities;
@layer base {
/* provides main font Lato */
/* Regular */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 400 600;
font-weight: 400;
src: url(assets/fonts/Lato/Lato-Regular.ttf) format('truetype');
}
/* Regular italic */
@font-face {
font-family: 'Lato';
font-style: italic;
font-weight: 400 600;
font-weight: 400;
src: url(assets/fonts/Lato/Lato-Italic.ttf) format('truetype');
}
/* Medium */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 500;
src: url(assets/fonts/Lato/Lato-Medium.ttf) format('truetype');
}
/* Semi-bold */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 600;
src: url(assets/fonts/Lato/Lato-Semibold.ttf) format('truetype');
}
/* Bold */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 700;
src: url(assets/fonts/Lato/Lato-Bold.ttf) format('truetype');
}
@font-face {
font-family: 'Lato';
font-style: italic;
font-weight: 700;
src: url(assets/fonts/Lato/Lato-BoldItalic.ttf) format('truetype');
}
/* icon font */
@font-face {
+8 -7
View File
@@ -20,14 +20,9 @@ export default {
// [L] node location select text value + icon + label
// [D] button text
DEFAULT: '#1C1B1F', // [D] main bg
oil: '#1F1F22', // [D] connection status bg
quartzite: '#202C25', // [D] "Connected" status bg
},
'blanc-nacre': {
DEFAULT: '#F2F4F6', // [L] main bg
platinum: '#E7E8EC', // [L] connection status bg
icicle: '#E1EFE7', // [L] "Connected" status bg
},
// [L] main bg
'blanc-nacre': '#F2F4F6',
// [DL] primary accent
melon: '#FB6E4E',
// [DL] secondary accent
@@ -44,6 +39,7 @@ export default {
// [L] bg for network modes
// [L] button text
white: '#FFF',
'flawed-white': '#FFFBFE',
black: '#000',
mercury: {
// [D] status-line title text + icon
@@ -63,6 +59,7 @@ export default {
'dim-gray': '#696571',
// [L] network mode desc text
// [L] node location select outline
// [L] connection status bg (combined with 10% opacity)
'cement-feet': '#79747E',
// [D] node location select outline
'gun-powder': '#49454F',
@@ -70,6 +67,10 @@ export default {
'laughing-jack': '#CAC4D0',
// [L] button bg in disabled state
'wind-chime': '#DEDEE1',
// [D] connection status bg (combined with 15% opacity)
oil: '#313033',
// [DL] "Connected" status bg (combined with 10% opacity)
'vert-prasin': '#47C45D',
},
extend: {
fontFamily: {