From f156c0f05d5e8c2c511b2d4b32edb59e213cf382 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sat, 10 Apr 2021 20:53:57 +0200 Subject: [PATCH] web/admin: fix header hight for inherited objects Signed-off-by: Jens Langhammer --- web/src/elements/router/RouterOutlet.ts | 2 ++ web/src/locales/en.po | 18 +++++++++--------- web/src/locales/pseudo-LOCALE.po | 18 +++++++++--------- web/src/pages/providers/ProviderViewPage.ts | 10 +--------- web/src/pages/sources/SourceViewPage.ts | 10 +--------- 5 files changed, 22 insertions(+), 36 deletions(-) diff --git a/web/src/elements/router/RouterOutlet.ts b/web/src/elements/router/RouterOutlet.ts index 41a56ae17..3480b312d 100644 --- a/web/src/elements/router/RouterOutlet.ts +++ b/web/src/elements/router/RouterOutlet.ts @@ -37,6 +37,8 @@ export class RouterOutlet extends LitElement { } *:first-child { height: 100%; + display: flex; + flex-direction: column; } `, ]; diff --git a/web/src/locales/en.po b/web/src/locales/en.po index c61f102dd..9e7a1681d 100644 --- a/web/src/locales/en.po +++ b/web/src/locales/en.po @@ -163,7 +163,7 @@ msgstr "App" #: src/elements/user/UserConsentList.ts:29 #: src/pages/admin-overview/TopApplicationsTable.ts:42 -#: src/pages/applications/ApplicationListPage.ts:100 +#: src/pages/applications/ApplicationListPage.ts:104 #: src/pages/providers/ProviderListPage.ts:53 msgid "Application" msgstr "Application" @@ -689,8 +689,8 @@ msgid "Copy Key" msgstr "Copy Key" #: src/pages/applications/ApplicationForm.ts:120 -#: src/pages/applications/ApplicationListPage.ts:116 -#: src/pages/applications/ApplicationListPage.ts:124 +#: src/pages/applications/ApplicationListPage.ts:120 +#: src/pages/applications/ApplicationListPage.ts:128 #: src/pages/crypto/CertificateKeyPairListPage.ts:122 #: src/pages/crypto/CertificateKeyPairListPage.ts:130 #: src/pages/events/RuleListPage.ts:91 @@ -736,7 +736,7 @@ msgstr "Copy Key" msgid "Create" msgstr "Create" -#: src/pages/applications/ApplicationListPage.ts:119 +#: src/pages/applications/ApplicationListPage.ts:123 #: src/pages/providers/RelatedApplicationButton.ts:30 msgid "Create Application" msgstr "Create Application" @@ -861,7 +861,7 @@ msgid "Define how notifications are sent to users, like Email or Webhook." msgstr "Define how notifications are sent to users, like Email or Webhook." #: src/elements/forms/DeleteForm.ts:79 -#: src/pages/applications/ApplicationListPage.ts:107 +#: src/pages/applications/ApplicationListPage.ts:111 #: src/pages/crypto/CertificateKeyPairListPage.ts:86 #: src/pages/events/RuleListPage.ts:82 #: src/pages/events/TransportListPage.ts:86 @@ -1007,7 +1007,7 @@ msgstr "Dummy stage used for testing. Shows a simple continue button and always msgid "Each provider has a different issuer, based on the application slug." msgstr "Each provider has a different issuer, based on the application slug." -#: src/pages/applications/ApplicationListPage.ts:90 +#: src/pages/applications/ApplicationListPage.ts:94 #: src/pages/applications/ApplicationViewPage.ts:94 #: src/pages/applications/ApplicationViewPage.ts:108 #: src/pages/crypto/CertificateKeyPairListPage.ts:74 @@ -2096,7 +2096,7 @@ msgstr "Only fail the policy, don't invalidate user's password." msgid "Only send notification once, for example when sending a webhook into a chat channel." msgstr "Only send notification once, for example when sending a webhook into a chat channel." -#: src/pages/applications/ApplicationListPage.ts:95 +#: src/pages/applications/ApplicationListPage.ts:99 msgid "Open application" msgstr "Open application" @@ -3439,7 +3439,7 @@ msgstr "Unknown" msgid "Up-to-date!" msgstr "Up-to-date!" -#: src/pages/applications/ApplicationListPage.ts:82 +#: src/pages/applications/ApplicationListPage.ts:86 #: src/pages/applications/ApplicationViewPage.ts:100 #: src/pages/crypto/CertificateKeyPairListPage.ts:66 #: src/pages/events/RuleListPage.ts:62 @@ -3477,7 +3477,7 @@ msgstr "Up-to-date!" msgid "Update" msgstr "Update" -#: src/pages/applications/ApplicationListPage.ts:85 +#: src/pages/applications/ApplicationListPage.ts:89 #: src/pages/applications/ApplicationViewPage.ts:103 msgid "Update Application" msgstr "Update Application" diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po index 471939bfb..f2882400d 100644 --- a/web/src/locales/pseudo-LOCALE.po +++ b/web/src/locales/pseudo-LOCALE.po @@ -163,7 +163,7 @@ msgstr "" #: src/elements/user/UserConsentList.ts:29 #: src/pages/admin-overview/TopApplicationsTable.ts:42 -#: src/pages/applications/ApplicationListPage.ts:100 +#: src/pages/applications/ApplicationListPage.ts:104 #: src/pages/providers/ProviderListPage.ts:53 msgid "Application" msgstr "" @@ -683,8 +683,8 @@ msgid "Copy Key" msgstr "" #: src/pages/applications/ApplicationForm.ts:120 -#: src/pages/applications/ApplicationListPage.ts:116 -#: src/pages/applications/ApplicationListPage.ts:124 +#: src/pages/applications/ApplicationListPage.ts:120 +#: src/pages/applications/ApplicationListPage.ts:128 #: src/pages/crypto/CertificateKeyPairListPage.ts:122 #: src/pages/crypto/CertificateKeyPairListPage.ts:130 #: src/pages/events/RuleListPage.ts:91 @@ -730,7 +730,7 @@ msgstr "" msgid "Create" msgstr "" -#: src/pages/applications/ApplicationListPage.ts:119 +#: src/pages/applications/ApplicationListPage.ts:123 #: src/pages/providers/RelatedApplicationButton.ts:30 msgid "Create Application" msgstr "" @@ -855,7 +855,7 @@ msgid "Define how notifications are sent to users, like Email or Webhook." msgstr "" #: src/elements/forms/DeleteForm.ts:79 -#: src/pages/applications/ApplicationListPage.ts:107 +#: src/pages/applications/ApplicationListPage.ts:111 #: src/pages/crypto/CertificateKeyPairListPage.ts:86 #: src/pages/events/RuleListPage.ts:82 #: src/pages/events/TransportListPage.ts:86 @@ -999,7 +999,7 @@ msgstr "" msgid "Each provider has a different issuer, based on the application slug." msgstr "" -#: src/pages/applications/ApplicationListPage.ts:90 +#: src/pages/applications/ApplicationListPage.ts:94 #: src/pages/applications/ApplicationViewPage.ts:94 #: src/pages/applications/ApplicationViewPage.ts:108 #: src/pages/crypto/CertificateKeyPairListPage.ts:74 @@ -2088,7 +2088,7 @@ msgstr "" msgid "Only send notification once, for example when sending a webhook into a chat channel." msgstr "" -#: src/pages/applications/ApplicationListPage.ts:95 +#: src/pages/applications/ApplicationListPage.ts:99 msgid "Open application" msgstr "" @@ -3429,7 +3429,7 @@ msgstr "" msgid "Up-to-date!" msgstr "" -#: src/pages/applications/ApplicationListPage.ts:82 +#: src/pages/applications/ApplicationListPage.ts:86 #: src/pages/applications/ApplicationViewPage.ts:100 #: src/pages/crypto/CertificateKeyPairListPage.ts:66 #: src/pages/events/RuleListPage.ts:62 @@ -3467,7 +3467,7 @@ msgstr "" msgid "Update" msgstr "" -#: src/pages/applications/ApplicationListPage.ts:85 +#: src/pages/applications/ApplicationListPage.ts:89 #: src/pages/applications/ApplicationViewPage.ts:103 msgid "Update Application" msgstr "" diff --git a/web/src/pages/providers/ProviderViewPage.ts b/web/src/pages/providers/ProviderViewPage.ts index e33db851a..17b8b8a41 100644 --- a/web/src/pages/providers/ProviderViewPage.ts +++ b/web/src/pages/providers/ProviderViewPage.ts @@ -1,4 +1,4 @@ -import { css, CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element"; +import { customElement, html, LitElement, property, TemplateResult } from "lit-element"; import "../../elements/buttons/SpinnerButton"; import "../../elements/EmptyState"; @@ -24,14 +24,6 @@ export class ProviderViewPage extends LitElement { @property({ attribute: false }) provider?: Provider; - static get styles(): CSSResult[] { - return [css` - * { - height: 100%; - } - `]; - } - renderProvider(): TemplateResult { if (!this.provider) { return html``; diff --git a/web/src/pages/sources/SourceViewPage.ts b/web/src/pages/sources/SourceViewPage.ts index 4dcab9ab6..7ad8fa8fa 100644 --- a/web/src/pages/sources/SourceViewPage.ts +++ b/web/src/pages/sources/SourceViewPage.ts @@ -1,4 +1,4 @@ -import { css, CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element"; +import { customElement, html, LitElement, property, TemplateResult } from "lit-element"; import { Source, SourcesApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; @@ -26,14 +26,6 @@ export class SourceViewPage extends LitElement { @property({ attribute: false }) source?: Source; - static get styles(): CSSResult[] { - return [css` - * { - height: 100%; - } - `]; - } - renderSource(): TemplateResult { if (!this.source) { return html``;