diff --git a/alfa-client/.vscode/settings.json b/alfa-client/.vscode/settings.json index 0a7d6401ce07c51f0113761e3d2ff898de83dae4..3c2ad39663882860f07dd4ffbb668035fe7c8af1 100644 --- a/alfa-client/.vscode/settings.json +++ b/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\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"] + ] } diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html index 289539503e057e738ad286eb176a044d15eb48ed..a8a263633434e0dc3f4693d414b9427470a1348e 100644 --- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html +++ b/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> diff --git a/alfa-client/libs/historie/src/lib/historie-container/historie-list/historie-item-bescheid/historie-item-bescheid-status/historie-item-bescheid-status.component.html b/alfa-client/libs/historie/src/lib/historie-container/historie-list/historie-item-bescheid/historie-item-bescheid-status/historie-item-bescheid-status.component.html index ffa521ec15f1c83f1f35e244b82cfb12aa4a2a0b..75b0dfcdd0a8270582ba4ac136c39921bba1d3b4 100644 --- a/alfa-client/libs/historie/src/lib/historie-container/historie-list/historie-item-bescheid/historie-item-bescheid-status/historie-item-bescheid-status.component.html +++ b/alfa-client/libs/historie/src/lib/historie-container/historie-list/historie-item-bescheid/historie-item-bescheid-status/historie-item-bescheid-status.component.html @@ -1,4 +1,4 @@ -<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 diff --git a/alfa-client/pom.xml b/alfa-client/pom.xml index b3bff4839a02bb9620acf36026c83fe0b0be562b..854ec00d432ea1ebea24ad59668c162de22bcf44 100644 --- a/alfa-client/pom.xml +++ b/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> diff --git a/alfa-server/pom.xml b/alfa-server/pom.xml index 26043f68b9f95ee1683ef3df656d948928d05346..ee48af6d0f7aa1b0f804250334a43ffde0780668 100644 --- a/alfa-server/pom.xml +++ b/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> diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml index a69391662c2952eabd436473d20303464fa7b57e..9353c1a1c507cd69c337a40f1293ebffe8412017 100644 --- a/alfa-service/pom.xml +++ b/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> diff --git a/alfa-xdomea/pom.xml b/alfa-xdomea/pom.xml index 974d3264432818886500159ecc9000fe06ffd2e3..b572f4474ff138e8f337e93e38dff8514a487b72 100644 --- a/alfa-xdomea/pom.xml +++ b/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> diff --git a/pom.xml b/pom.xml index cef9e2b092340cc966819f88f9d87ddf28e811d2..aa707651cdc6c5f822f0dcb2ba123c0ce4e2aa2e 100644 --- a/pom.xml +++ b/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>