diff --git a/src/backend/views/frontend.pug b/src/backend/views/frontend.pug index fb78e58..f5cac53 100644 --- a/src/backend/views/frontend.pug +++ b/src/backend/views/frontend.pug @@ -14,6 +14,7 @@ html meta(name='twitter:card' content='summary') meta(name='twitter:site' content='@Xeltica') meta(name='twitter:creator' content='@Xeltica') + link(rel="stylesheet" href="https://koruri.chillout.chat/koruri.css") link(rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css") style. .loading { diff --git a/src/frontend/components/AccountsPage.tsx b/src/frontend/components/AccountsPage.tsx index 27a1eff..1cc8aff 100644 --- a/src/frontend/components/AccountsPage.tsx +++ b/src/frontend/components/AccountsPage.tsx @@ -31,12 +31,11 @@ export const AccountsPage: React.VFC = () => { ) : (
-
-
-

{t('_accounts.currentAccount')}

-

@{data.username}@{data.host}

-
-
+
+

+ {t('_accounts.currentAccount')}: @{data.username}@{data.host} +

+

{t('_accounts.switchAccount')}

diff --git a/src/frontend/components/AnnouncementList.tsx b/src/frontend/components/AnnouncementList.tsx index 8a01e03..ced2f24 100644 --- a/src/frontend/components/AnnouncementList.tsx +++ b/src/frontend/components/AnnouncementList.tsx @@ -24,8 +24,8 @@ export const AnnouncementList: React.VFC = () => { if (announcements.length === 0) return null; return ( - -

{t('announcements')}

+ <> +

{t('announcements')}

{announcements.map(a => ( @@ -33,6 +33,6 @@ export const AnnouncementList: React.VFC = () => { ))}
-
+ ); }; diff --git a/src/frontend/components/SettingPage.tsx b/src/frontend/components/SettingPage.tsx index 1cc7db5..55c397b 100644 --- a/src/frontend/components/SettingPage.tsx +++ b/src/frontend/components/SettingPage.tsx @@ -93,7 +93,7 @@ export const SettingPage: React.VFC = () => {

{t('appearance')}

{t('theme')}

-
+
{ themes.map(theme => (
- - -

{t('logoutDescription')}

-
- - -

{t('deleteAccountDescription')}

-
+
+ + +
); }; diff --git a/src/frontend/pages/announcement.tsx b/src/frontend/pages/announcement.tsx index f1bd8d9..b8d4bf4 100644 --- a/src/frontend/pages/announcement.tsx +++ b/src/frontend/pages/announcement.tsx @@ -20,25 +20,27 @@ export const AnnouncementPage: React.VFC = () => { return (
{!announcement ? : ( - <> -
-

{announcement.title}

- -
-
- {(() => { - const res: ReactNodeArray = []; - announcement.body.split('\n').forEach(s => { - res.push(<>{s}); - res.push(
); - }); - return res; - })()} -
- +
+
+
+

{announcement.title}

+ +
+
+ {(() => { + const res: ReactNodeArray = []; + announcement.body.split('\n').forEach(s => { + res.push(<>{s}); + res.push(
); + }); + return res; + })()} +
+
+
)}
); diff --git a/src/frontend/style.scss b/src/frontend/style.scss index 9fa9156..11c0ddb 100644 --- a/src/frontend/style.scss +++ b/src/frontend/style.scss @@ -1,5 +1,6 @@ body { --primary: rgb(134, 179, 0); + font-family: "Koruri", sans-serif; font-feature-settings: "pkna"; } diff --git a/yarn.lock b/yarn.lock index dc8e897..e4108ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1620,6 +1620,13 @@ debug@2.6.9, debug@^2.2.0: dependencies: ms "2.0.0" +debug@=3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + debug@^3.1.0, debug@^3.2.6: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -2253,6 +2260,13 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== +follow-redirects@1.5.10: + version "1.5.10" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" + integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== + dependencies: + debug "=3.1.0" + follow-redirects@^1.14.0: version "1.14.4" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379" @@ -5633,8 +5647,8 @@ xdg-basedir@^4.0.0: integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== xeltica-ui@xeltica/ui: - version "1.0.0-alpha.7" - resolved "https://codeload.github.com/xeltica/ui/tar.gz/765a73de505b5e405021b8ce182f4e3627560e72" + version "1.0.0-alpha.15" + resolved "https://codeload.github.com/xeltica/ui/tar.gz/d8088a79e78f0795a92a542d872b3449ad34dbcb" xml2js@^0.4.17: version "0.4.23"