From 5f6f5dbfc41ef02b715158e55aec98d28e103678 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 17 Mar 2021 21:20:47 +0100 Subject: [PATCH] web: revert to use full pf in skeleton to improve FMP Signed-off-by: Jens Langhammer --- authentik/core/templates/base/skeleton.html | 2 +- web/rollup.config.js | 5 +++-- web/src/flows/FlowExecutor.ts | 4 ---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/authentik/core/templates/base/skeleton.html b/authentik/core/templates/base/skeleton.html index e22bd2565..c5b0adc98 100644 --- a/authentik/core/templates/base/skeleton.html +++ b/authentik/core/templates/base/skeleton.html @@ -11,7 +11,7 @@ {% block title %}{% trans title|default:config.authentik.branding.title %}{% endblock %} - + {% block head %} diff --git a/web/rollup.config.js b/web/rollup.config.js index f7fe7192d..4a11dcd88 100644 --- a/web/rollup.config.js +++ b/web/rollup.config.js @@ -8,10 +8,11 @@ import copy from "rollup-plugin-copy"; import externalGlobals from "rollup-plugin-external-globals"; const resources = [ - { src: "node_modules/@patternfly/patternfly/patternfly-base.css", dest: "dist/" }, + { src: "node_modules/@patternfly/patternfly/patternfly.min.css", dest: "dist/" }, + { src: "src/authentik.css", dest: "dist/" }, + { src: "node_modules/@patternfly/patternfly/assets/*", dest: "dist/assets/" }, { src: "src/index.html", dest: "dist" }, - { src: "src/authentik.css", dest: "dist" }, { src: "src/assets/*", dest: "dist/assets" }, { src: "./icons/*", dest: "dist/assets/icons" }, ]; diff --git a/web/src/flows/FlowExecutor.ts b/web/src/flows/FlowExecutor.ts index 5ba23400c..af8836dff 100644 --- a/web/src/flows/FlowExecutor.ts +++ b/web/src/flows/FlowExecutor.ts @@ -2,9 +2,6 @@ import { gettext } from "django"; import { LitElement, html, customElement, property, TemplateResult, CSSResult, css } from "lit-element"; import PFLogin from "@patternfly/patternfly/components/Login/login.css"; -import PFBackgroundImage from "@patternfly/patternfly/components/BackgroundImage/background-image.css"; -import PFList from "@patternfly/patternfly/components/List/list.css"; -import AKGlobal from "../authentik.css"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; import PFTitle from "@patternfly/patternfly/components/Title/title.css"; @@ -77,7 +74,6 @@ export class FlowExecutor extends LitElement implements StageHost { this.addEventListener("ak-flow-submit", () => { this.submit(); }); - document.adoptedStyleSheets = [PFLogin, PFBackgroundImage, PFList, AKGlobal]; } submit(formData?: T): Promise {