Merge branch 'master' into OZG-5010-Bescheid-Dokumente-hochladen-E2E

alfa-client/.vscode/settings.json

@@ -11,8 +11,11 @@
   "files.eol": "\n",
   "files.trimTrailingWhitespace": true,
   "prettier.useTabs": false,
-  "tailwindCSS.experimental.configFile": "../libs/design-system/tailwind-preset/tailwind.config.js",
   "editor.codeActionsOnSave": {
     "source.organizeImports": "never"
-  }
+  },
+  "tailwindCSS.experimental.classRegex": [
+    ["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"],
+    ["cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"]
+  ]
 }

alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html

@@ -9,12 +9,12 @@
   <div close class="flex-shrink self-center">
     <button
       *ngIf="deletable"
-      class="flex size-10 items-center justify-center rounded-md hover:border hover:border-ozggray-600 hover:bg-ozggray-100"
+      class="flex size-10 items-center justify-center rounded-md hover:border hover:border-grayborder hover:bg-background-50"
       (click)="deleteFile()"
       title="Anhang löschen"
       aria-label="Anhang löschen Button"
     >
-      <ods-close-icon></ods-close-icon>
+      <ods-close-icon class="fill-text"></ods-close-icon>
     </button>
   </div>
 </ods-attachment>

alfa-client/libs/historie/src/lib/historie-container/historie-list/historie-item-bescheid/historie-item-bescheid-status/historie-item-bescheid-status.component.html

-<p class="flex text-base font-bold text-text">
+<p class="flex text-sm font-bold text-text">
   <span class="flex items-center gap-2">
     <span *ngIf="bescheid.bewilligt | convertToBoolean" data-test-class="bewilligt"
       >Bewilligt am</span

alfa-client/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.alfa</groupId>
 		<artifactId>alfa</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 	</parent>
 
     <modelVersion>4.0.0</modelVersion>

alfa-server/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.ozgcloud.alfa</groupId>
 		<artifactId>alfa</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>alfa-server</artifactId>

alfa-service/pom.xml

@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.ozgcloud.alfa</groupId>
 		<artifactId>alfa</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>alfa-service</artifactId>

alfa-xdomea/pom.xml

@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.ozgcloud.alfa</groupId>
 		<artifactId>alfa</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>alfa-xdomea</artifactId>

pom.xml

@@ -35,7 +35,7 @@
 
 	<groupId>de.ozgcloud.alfa</groupId>
 	<artifactId>alfa</artifactId>
-	<version>2.7.0-SNAPSHOT</version>
+	<version>2.8.0-SNAPSHOT</version>
 	<name>Alfa Parent</name>
 	<packaging>pom</packaging>
 
@@ -50,8 +50,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<vorgang-manager.version>2.7.0-SNAPSHOT</vorgang-manager.version>
-		<nachrichten-manager.version>2.7.0-SNAPSHOT</nachrichten-manager.version>
+		<vorgang-manager.version>2.7.0</vorgang-manager.version>
+		<nachrichten-manager.version>2.7.0</nachrichten-manager.version>
 		<ozgcloud-common-pdf.version>3.0.1</ozgcloud-common-pdf.version>
 		<user-manager.version>2.2.0</user-manager.version>
 
@@ -106,7 +106,7 @@
 			<dependency>
 				<groupId>de.ozgcloud.nachrichten</groupId>
 				<artifactId>nachrichten-manager-interface</artifactId>
-				<version>2.7.0-SNAPSHOT</version>
+				<version>2.7.0</version>
 			</dependency>
 			<dependency>
 				<groupId>de.ozgcloud.vorgang</groupId>