diff --git a/Jenkinsfile b/Jenkinsfile
index deb6ce4266ec36519843962e4f378ed44768e381..1ab8edc5cc6893467c0899840c921efe0f1e550e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -494,4 +494,4 @@ String getRootPomVersion() {
String getParentPomVersion(String filePath) {
def pom = readMavenPom file: filePath
return pom.parent.version
-}
\ No newline at end of file
+}
diff --git a/alfa-client/apps/admin/src/styles.scss b/alfa-client/apps/admin/src/styles.scss
index e9a497ed35ba9c4e1b93a5e8b51ffd2d909d9bd7..d4e151f329f1cefda33709ace138cd39fb383a7a 100644
--- a/alfa-client/apps/admin/src/styles.scss
+++ b/alfa-client/apps/admin/src/styles.scss
@@ -3,3 +3,11 @@
@tailwind utilities;
@import 'libs/design-system/src/lib/tailwind-preset/root.css';
+
+.heading-1 {
+ @apply text-3xl font-medium text-text;
+}
+
+.heading-2 {
+ @apply py-4 text-2xl font-medium text-text;
+}
diff --git a/alfa-client/apps/alfa-e2e/docker-compose.yml b/alfa-client/apps/alfa-e2e/docker-compose.yml
index 8110aa118c4c0e22d75734f3fb079b70cc8696cf..e541a7eef1c009fcd890726f87fb35cb11b50868 100644
--- a/alfa-client/apps/alfa-e2e/docker-compose.yml
+++ b/alfa-client/apps/alfa-e2e/docker-compose.yml
@@ -33,8 +33,6 @@ services:
interval: 10s
timeout: 10s
retries: 5
- networks:
- - ozgcloud
vorgang-manager:
image: docker.ozg-sh.de/vorgang-manager:${VORGANG_MANAGER_DOCKER_IMAGE:-snapshot-latest}
@@ -81,8 +79,6 @@ services:
condition: service_healthy
user-manager:
condition: service_started
- networks:
- - ozgcloud
alfa:
image: docker.ozg-sh.de/alfa:${ALFA_DOCKER_IMAGE:-snapshot-latest}
@@ -119,8 +115,6 @@ services:
- vorgang-manager
- user-manager
- zufi-manager-server
- networks:
- - ozgcloud
elastic:
image: docker.elastic.co/elasticsearch/elasticsearch:8.3.2
@@ -151,8 +145,6 @@ services:
interval: 10s
timeout: 10s
retries: 5
- networks:
- - ozgcloud
user-manager:
image: docker.ozg-sh.de/user-manager:${USER_MANAGER_DOCKER_IMAGE:-snapshot-latest}
@@ -183,8 +175,6 @@ services:
depends_on:
mongodb:
condition: service_healthy
- networks:
- - ozgcloud
zufi-manager-pvog:
image: docker.ozg-sh.de/zufi-manager:snapshot-latest
@@ -199,8 +189,6 @@ services:
condition: service_healthy
smocker-init:
condition: service_completed_successfully
- networks:
- - ozgcloud
zufi-manager-server:
image: docker.ozg-sh.de/zufi-server:snapshot-latest
@@ -216,8 +204,6 @@ services:
condition: service_healthy
zufi-manager-pvog:
condition: service_completed_successfully
- networks:
- - ozgcloud
smocker:
image: thiht/smocker
@@ -229,8 +215,6 @@ services:
interval: 5s
timeout: 5s
retries: 5
- networks:
- - ozgcloud
smocker-init:
image: alpine/curl
@@ -242,9 +226,3 @@ services:
depends_on:
smocker:
condition: service_healthy
- networks:
- - ozgcloud
-
-networks:
- ozgcloud:
- driver: bridge
diff --git a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.html b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.html
index dbc6d9eddd9d63fb982da496a7a4636210670ce8..d324f8d83fe91defe9b5066f4f24d230bc33eb4f 100644
--- a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.html
+++ b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.html
@@ -1,4 +1,4 @@
-<h1 class="text-2xl font-bold">Organisationseinheiten</h1>
+<h1 class="heading-1 pb-4">Organisationseinheiten</h1>
<p id="absender-desc" class="p-1">Hinterlegen Sie Name und ID der Organisationseinheiten.</p>
<admin-organisationseinheit-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 5ebfbc7da60ca54abbabb4135ce809216b274f88..cf06ca1af3045314ba30e32d03ac45b8aa5c7203 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,5 +1,6 @@
<form class="form flex-col" [formGroup]="formService.form">
- <h1 class="text-2xl font-bold">Absender</h1>
+ <h1 class="heading-1">Postfach</h1>
+ <h2 class="heading-2">Absender</h2>
<p id="absender-desc" class="p-1">Hinterlegen Sie Absenderinformationen zu Ihrem Postfach.</p>
<div
[formGroupName]="PostfachFormService.ASBSENDER_GROUP"
@@ -33,7 +34,7 @@
></text-field>
</div>
<div class="h-20"></div>
- <h1 class="text-2xl font-bold">Signatur</h1>
+ <h2 class="heading-2">Signatur</h2>
<p id="signatur-desc">Erstellen oder ändern Sie die Signatur für Nachrichten.</p>
<textarea
data-test-id="signatur-text"
diff --git a/alfa-client/libs/design-system/.storybook/styles.scss b/alfa-client/libs/design-system/.storybook/styles.scss
index 4a89ff65290c2820edbc6553fd53888807a98bd7..070e34c4f9df1c9fd2e82dba14fe52f4133d4290 100644
--- a/alfa-client/libs/design-system/.storybook/styles.scss
+++ b/alfa-client/libs/design-system/.storybook/styles.scss
@@ -1 +1,2 @@
-@import '../src/lib/tailwind-preset/root.css';
\ No newline at end of file
+@import '../src/lib/tailwind-preset/root.css';
+@import '../../../apps/admin/src/styles.scss';
diff --git a/alfa-client/libs/design-system/nginx.conf b/alfa-client/libs/design-system/nginx.conf
index add779e6030ab68ebb8f5dde211d26f25e69a2e4..84da5283449a85072c5d235381383eee86a44d49 100644
--- a/alfa-client/libs/design-system/nginx.conf
+++ b/alfa-client/libs/design-system/nginx.conf
@@ -32,8 +32,11 @@ http {
location / {
- root /usr/share/nginx/html/design-system;
+ root /usr/share/nginx/html/design-system/;
index index.html index.htm;
+
+ #add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
+ #add_header Expires "0";
}
diff --git a/alfa-client/libs/design-system/src/lib/heading/heading.stories.ts b/alfa-client/libs/design-system/src/lib/heading/heading.stories.ts
new file mode 100644
index 0000000000000000000000000000000000000000..6eac165bb7e17ffa37fb79dcf4372a8273af1609
--- /dev/null
+++ b/alfa-client/libs/design-system/src/lib/heading/heading.stories.ts
@@ -0,0 +1,24 @@
+import { type Meta, type StoryObj } from '@storybook/angular';
+
+const meta: Meta = {
+ title: 'Typography/Heading',
+ excludeStories: /.*Data$/,
+ tags: ['autodocs'],
+ parameters: {
+ docs: {
+ description: {
+ component:
+ 'The headings are native HTML h-elements, styled with additional classes (see code)',
+ },
+ },
+ },
+};
+
+export default meta;
+type Story = StoryObj;
+
+export const Default: Story = {
+ render: () => ({
+ template: '<h1 class="heading-1">Heading 1</h1><h2 class="heading-2">Heading 2</h2>',
+ }),
+};