From 0226626e0618529ff76121a400bb301cf2164fe0 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Tue, 10 Sep 2024 11:01:53 +0200 Subject: [PATCH] OZG-6497 Remove unused style import * Apply new heading styles --- alfa-client/apps/admin/src/styles.scss | 8 ++++++-- .../postfach-container/postfach-container.component.html | 2 +- .../postfach-form/postfach-form.component.html | 2 +- .../postfach-signatur/postfach-signatur.component.html | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/alfa-client/apps/admin/src/styles.scss b/alfa-client/apps/admin/src/styles.scss index a93f53d818..9a4448d0f9 100644 --- a/alfa-client/apps/admin/src/styles.scss +++ b/alfa-client/apps/admin/src/styles.scss @@ -1,8 +1,14 @@ +@use '@angular/material' as mat; + @tailwind base; @tailwind components; @tailwind utilities; @import 'libs/design-system/src/lib/tailwind-preset/root.css'; +@import 'libs/ui/src/lib/font/font_material'; + +@include mat.all-component-typographies(); +@include mat.core(); .heading-1 { @apply text-3xl font-medium text-text; @@ -11,5 +17,3 @@ .heading-2 { @apply py-4 text-2xl font-medium text-text; } - -@import '../../alfa/src/styles/main.scss'; diff --git a/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-container.component.html b/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-container.component.html index 58c327562f..8c406667e4 100644 --- a/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-container.component.html +++ b/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-container.component.html @@ -1,2 +1,2 @@ -<h1 class="mb-10 text-4xl font-bold">Postfach</h1> +<h1 class="heading-1">Postfach</h1> <postfach-form [postfachStateResource]="postfachStateResource$ | async"></postfach-form> diff --git a/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.html b/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.html index d1ae6e81fa..a5aace656e 100644 --- a/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.html +++ b/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.html @@ -1,6 +1,6 @@ <form class="form flex-col" [formGroup]="formService.form"> <!-- - <h1 class="text-2xl font-bold">Absender</h1> + <h2 class="heading-2">Absender</h1> <p id="absender-desc" class="p-1">Hinterlegen Sie Absenderinformationen zu Ihrem Postfach.</p> <div [formGroupName]="PostfachFormService.ASBSENDER_GROUP" diff --git a/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component.html b/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component.html index f18140a69d..a69ca6d989 100644 --- a/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component.html +++ b/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component.html @@ -1,5 +1,5 @@ <form [formGroup]="formService.form"> - <h3 class="mb-3 font-bold">Signatur</h3> + <h2 class="heading-2">Signatur</h2> <p id="signatur-desc"> Diese Signatur wird bei allen Nachrichten an den Antragsteller angezeigt. </p> -- GitLab