From 430e3c576cfdc45460c05b0fae55ba76359355f7 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 11 Apr 2021 18:56:43 +0200 Subject: [PATCH] web: always set css variables Signed-off-by: Jens Langhammer --- web/src/authentik.css | 16 ++++++------- web/src/elements/PageHeader.ts | 2 ++ web/src/locales/en.po | 24 +++++++++++-------- web/src/locales/pseudo-LOCALE.po | 24 +++++++++++-------- .../pages/admin-overview/AdminOverviewPage.ts | 3 ++- 5 files changed, 40 insertions(+), 29 deletions(-) diff --git a/web/src/authentik.css b/web/src/authentik.css index ea7769dcf..c20265d65 100644 --- a/web/src/authentik.css +++ b/web/src/authentik.css @@ -1,5 +1,13 @@ :root { --ak-accent: #fd4b2d; + + --ak-dark-foreground: #fafafa; + --ak-dark-foreground-darker: #bebebe; + --ak-dark-foreground-link: #5a5cb9; + --ak-dark-background: #18191a; + --ak-dark-background-darker: #000000; + --ak-dark-background-light: #1c1e21; + --ak-dark-background-lighter: #2b2e33; } html { @@ -92,14 +100,6 @@ body { @media (prefers-color-scheme: dark) { :root { - --ak-dark-foreground: #fafafa; - --ak-dark-foreground-darker: #bebebe; - --ak-dark-foreground-link: #5a5cb9; - --ak-dark-background: #18191a; - --ak-dark-background-darker: #000000; - --ak-dark-background-light: #1c1e21; - --ak-dark-background-lighter: #2b2e33; - --pf-global--Color--100: var(--ak-dark-foreground); --pf-c-page__main-section--m-light--BackgroundColor: var(--ak-dark-background-darker); --pf-global--link--Color: var(--ak-dark-foreground-link); diff --git a/web/src/elements/PageHeader.ts b/web/src/elements/PageHeader.ts index d0efafc2c..ff85769fc 100644 --- a/web/src/elements/PageHeader.ts +++ b/web/src/elements/PageHeader.ts @@ -39,9 +39,11 @@ export class PageHeader extends LitElement { :host { display: flex; flex-direction: row; + min-height: 114px; } button.sidebar-trigger { background-color: var(--pf-c-page__main-section--m-light--BackgroundColor); + border-radius: 0px; } .pf-c-page__main-section { width: 100%; diff --git a/web/src/locales/en.po b/web/src/locales/en.po index 2329c0fe0..91adfb9b6 100644 --- a/web/src/locales/en.po +++ b/web/src/locales/en.po @@ -188,7 +188,7 @@ msgstr "Application's display Name." msgid "Applications" msgstr "Applications" -#: src/pages/admin-overview/AdminOverviewPage.ts:42 +#: src/pages/admin-overview/AdminOverviewPage.ts:43 msgid "Apps with most usage" msgstr "Apps with most usage" @@ -329,7 +329,7 @@ msgstr "Backup finished with errors." msgid "Backup finished with warnings." msgstr "Backup finished with warnings." -#: src/pages/admin-overview/AdminOverviewPage.ts:59 +#: src/pages/admin-overview/AdminOverviewPage.ts:60 msgid "Backup status" msgstr "Backup status" @@ -393,11 +393,11 @@ msgstr "Built-in" msgid "CA which the endpoint's Certificate is verified against. Can be left empty for no validation." msgstr "CA which the endpoint's Certificate is verified against. Can be left empty for no validation." -#: src/pages/admin-overview/AdminOverviewPage.ts:57 +#: src/pages/admin-overview/AdminOverviewPage.ts:58 msgid "Cached Flows" msgstr "Cached Flows" -#: src/pages/admin-overview/AdminOverviewPage.ts:55 +#: src/pages/admin-overview/AdminOverviewPage.ts:56 msgid "Cached Policies" msgstr "Cached Policies" @@ -1394,6 +1394,10 @@ msgstr "Friendly Name" msgid "From address" msgstr "From address" +#: src/pages/admin-overview/AdminOverviewPage.ts:36 +msgid "General system status" +msgstr "General system status" + #: src/pages/crypto/CertificateKeyPairListPage.ts:135 #: src/pages/crypto/CertificateKeyPairListPage.ts:143 msgid "Generate" @@ -1751,7 +1755,7 @@ msgstr "Login to continue to {0}." msgid "Logins" msgstr "Logins" -#: src/pages/admin-overview/AdminOverviewPage.ts:39 +#: src/pages/admin-overview/AdminOverviewPage.ts:40 #: src/pages/applications/ApplicationViewPage.ts:68 msgid "Logins over the last 24 hours" msgstr "Logins over the last 24 hours" @@ -2241,7 +2245,7 @@ msgid "Please enter your password" msgstr "Please enter your password" #: src/interfaces/AdminInterface.ts:26 -#: src/pages/admin-overview/AdminOverviewPage.ts:47 +#: src/pages/admin-overview/AdminOverviewPage.ts:48 #: src/pages/flows/FlowListPage.ts:50 #: src/pages/policies/PolicyListPage.ts:38 msgid "Policies" @@ -2395,7 +2399,7 @@ msgid "Provider type" msgstr "Provider type" #: src/interfaces/AdminInterface.ts:20 -#: src/pages/admin-overview/AdminOverviewPage.ts:45 +#: src/pages/admin-overview/AdminOverviewPage.ts:46 #: src/pages/outposts/OutpostForm.ts:82 #: src/pages/outposts/OutpostListPage.ts:51 msgid "Providers" @@ -3681,7 +3685,7 @@ msgid "Username: Same as Text input, but checks for and prevents duplicate usern msgstr "Username: Same as Text input, but checks for and prevents duplicate usernames." #: src/interfaces/AdminInterface.ts:32 -#: src/pages/admin-overview/AdminOverviewPage.ts:49 +#: src/pages/admin-overview/AdminOverviewPage.ts:50 #: src/pages/users/UserListPage.ts:32 msgid "Users" msgstr "Users" @@ -3722,7 +3726,7 @@ msgstr "Verification Certificate" msgid "Verify the user's email address by sending them a one-time-link. Can also be used for recovery to verify the user's authenticity." msgstr "Verify the user's email address by sending them a one-time-link. Can also be used for recovery to verify the user's authenticity." -#: src/pages/admin-overview/AdminOverviewPage.ts:51 +#: src/pages/admin-overview/AdminOverviewPage.ts:52 msgid "Version" msgstr "Version" @@ -3821,7 +3825,7 @@ msgstr "Whoops!" msgid "Windows" msgstr "Windows" -#: src/pages/admin-overview/AdminOverviewPage.ts:53 +#: src/pages/admin-overview/AdminOverviewPage.ts:54 msgid "Workers" msgstr "Workers" diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po index 7b2b927ec..4550a0b12 100644 --- a/web/src/locales/pseudo-LOCALE.po +++ b/web/src/locales/pseudo-LOCALE.po @@ -188,7 +188,7 @@ msgstr "" msgid "Applications" msgstr "" -#: src/pages/admin-overview/AdminOverviewPage.ts:42 +#: src/pages/admin-overview/AdminOverviewPage.ts:43 msgid "Apps with most usage" msgstr "" @@ -325,7 +325,7 @@ msgstr "" msgid "Backup finished with warnings." msgstr "" -#: src/pages/admin-overview/AdminOverviewPage.ts:59 +#: src/pages/admin-overview/AdminOverviewPage.ts:60 msgid "Backup status" msgstr "" @@ -389,11 +389,11 @@ msgstr "" msgid "CA which the endpoint's Certificate is verified against. Can be left empty for no validation." msgstr "" -#: src/pages/admin-overview/AdminOverviewPage.ts:57 +#: src/pages/admin-overview/AdminOverviewPage.ts:58 msgid "Cached Flows" msgstr "" -#: src/pages/admin-overview/AdminOverviewPage.ts:55 +#: src/pages/admin-overview/AdminOverviewPage.ts:56 msgid "Cached Policies" msgstr "" @@ -1386,6 +1386,10 @@ msgstr "" msgid "From address" msgstr "" +#: src/pages/admin-overview/AdminOverviewPage.ts:36 +msgid "General system status" +msgstr "" + #: src/pages/crypto/CertificateKeyPairListPage.ts:135 #: src/pages/crypto/CertificateKeyPairListPage.ts:143 msgid "Generate" @@ -1743,7 +1747,7 @@ msgstr "" msgid "Logins" msgstr "" -#: src/pages/admin-overview/AdminOverviewPage.ts:39 +#: src/pages/admin-overview/AdminOverviewPage.ts:40 #: src/pages/applications/ApplicationViewPage.ts:68 msgid "Logins over the last 24 hours" msgstr "" @@ -2233,7 +2237,7 @@ msgid "Please enter your password" msgstr "" #: src/interfaces/AdminInterface.ts:26 -#: src/pages/admin-overview/AdminOverviewPage.ts:47 +#: src/pages/admin-overview/AdminOverviewPage.ts:48 #: src/pages/flows/FlowListPage.ts:50 #: src/pages/policies/PolicyListPage.ts:38 msgid "Policies" @@ -2387,7 +2391,7 @@ msgid "Provider type" msgstr "" #: src/interfaces/AdminInterface.ts:20 -#: src/pages/admin-overview/AdminOverviewPage.ts:45 +#: src/pages/admin-overview/AdminOverviewPage.ts:46 #: src/pages/outposts/OutpostForm.ts:82 #: src/pages/outposts/OutpostListPage.ts:51 msgid "Providers" @@ -3671,7 +3675,7 @@ msgid "Username: Same as Text input, but checks for and prevents duplicate usern msgstr "" #: src/interfaces/AdminInterface.ts:32 -#: src/pages/admin-overview/AdminOverviewPage.ts:49 +#: src/pages/admin-overview/AdminOverviewPage.ts:50 #: src/pages/users/UserListPage.ts:32 msgid "Users" msgstr "" @@ -3712,7 +3716,7 @@ msgstr "" msgid "Verify the user's email address by sending them a one-time-link. Can also be used for recovery to verify the user's authenticity." msgstr "" -#: src/pages/admin-overview/AdminOverviewPage.ts:51 +#: src/pages/admin-overview/AdminOverviewPage.ts:52 msgid "Version" msgstr "" @@ -3811,7 +3815,7 @@ msgstr "" msgid "Windows" msgstr "" -#: src/pages/admin-overview/AdminOverviewPage.ts:53 +#: src/pages/admin-overview/AdminOverviewPage.ts:54 msgid "Workers" msgstr "" diff --git a/web/src/pages/admin-overview/AdminOverviewPage.ts b/web/src/pages/admin-overview/AdminOverviewPage.ts index a18eb86da..e05535309 100644 --- a/web/src/pages/admin-overview/AdminOverviewPage.ts +++ b/web/src/pages/admin-overview/AdminOverviewPage.ts @@ -33,7 +33,8 @@ export class AdminOverviewPage extends LitElement { return html` + header=${t`System Overview`} + description=${t`General system status`}>