From 2698d9d23aa399d8565e70eb040c8c112b34eca0 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Wed, 17 Mar 2021 13:23:33 +0100
Subject: [PATCH] web: remove COMMON_STYLES from message

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 web/src/elements/EmptyState.ts                | 4 ++--
 web/src/elements/messages/Message.ts          | 9 +++++++--
 web/src/elements/messages/MessageContainer.ts | 5 +++--
 web/src/flows/FlowExecutor.ts                 | 6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/web/src/elements/EmptyState.ts b/web/src/elements/EmptyState.ts
index 0bd59547d..a1a14cb2b 100644
--- a/web/src/elements/EmptyState.ts
+++ b/web/src/elements/EmptyState.ts
@@ -1,7 +1,7 @@
 import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
 import PFEmptyState from "@patternfly/patternfly/components/EmptyState/empty-state.css";
-import PFBase from "@patternfly/patternfly/patternfly-base.css";
 import FA from "@fortawesome/fontawesome-free/css/fontawesome.css";
+import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 @customElement("ak-empty-state")
 export class EmptyState extends LitElement {
@@ -13,7 +13,7 @@ export class EmptyState extends LitElement {
     header?: string;
 
     static get styles(): CSSResult[] {
-        return [PFEmptyState, PFBase, FA];
+        return [PFBase, FA, PFEmptyState];
     }
 
     render(): TemplateResult {
diff --git a/web/src/elements/messages/Message.ts b/web/src/elements/messages/Message.ts
index b36969239..79ce70cc2 100644
--- a/web/src/elements/messages/Message.ts
+++ b/web/src/elements/messages/Message.ts
@@ -1,5 +1,10 @@
 import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
-import { COMMON_STYLES } from "../../common/styles";
+
+import PFAlertGroup from "@patternfly/patternfly/components/AlertGroup/alert-group.css";
+import PFAlert from "@patternfly/patternfly/components/Alert/alert.css";
+import PFBase from "@patternfly/patternfly/patternfly-base.css";
+import PFButton from "@patternfly/patternfly/components/Button/button.css";
+import FA from "@fortawesome/fontawesome-free/css/fontawesome.css";
 
 export interface APIMessage {
     level_tag: string;
@@ -27,7 +32,7 @@ export class Message extends LitElement {
     onRemove?: (m: APIMessage) => void;
 
     static get styles(): CSSResult[] {
-        return COMMON_STYLES;
+        return [PFBase, FA, PFButton, PFAlert, PFAlertGroup];
     }
 
     firstUpdated(): void {
diff --git a/web/src/elements/messages/MessageContainer.ts b/web/src/elements/messages/MessageContainer.ts
index 05a7409c3..fe7f1275e 100644
--- a/web/src/elements/messages/MessageContainer.ts
+++ b/web/src/elements/messages/MessageContainer.ts
@@ -1,8 +1,9 @@
 import { gettext } from "django";
 import { LitElement, html, customElement, TemplateResult, property, CSSResult } from "lit-element";
-import { COMMON_STYLES } from "../../common/styles";
 import "./Message";
 import { APIMessage } from "./Message";
+import PFAlertGroup from "@patternfly/patternfly/components/AlertGroup/alert-group.css";
+import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 export function showMessage(message: APIMessage): void {
     const container = document.querySelector<MessageContainer>("ak-message-container");
@@ -23,7 +24,7 @@ export class MessageContainer extends LitElement {
     retryDelay = 200;
 
     static get styles(): CSSResult[] {
-        return COMMON_STYLES;
+        return [PFBase, PFAlertGroup];
     }
 
     constructor() {
diff --git a/web/src/flows/FlowExecutor.ts b/web/src/flows/FlowExecutor.ts
index a8559f90b..7c14574e2 100644
--- a/web/src/flows/FlowExecutor.ts
+++ b/web/src/flows/FlowExecutor.ts
@@ -1,9 +1,9 @@
 import { gettext } from "django";
 import { LitElement, html, customElement, property, TemplateResult, CSSResult, css } from "lit-element";
 
-import PFLogin from "../../node_modules/@patternfly/patternfly/components/Login/login.css";
-import PFBackgroundImage from "../../node_modules/@patternfly/patternfly/components/BackgroundImage/background-image.css";
-import PFList from "../../node_modules/@patternfly/patternfly/components/List/list.css";
+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 { unsafeHTML } from "lit-html/directives/unsafe-html";