From c6b0f2a92d2c22bc88299fa2d32527c7eb8850e4 Mon Sep 17 00:00:00 2001 From: Martin Maul Date: Wed, 26 Jun 2024 15:36:41 +0200 Subject: [PATCH 1/3] chore(uux): 913 notification status colors change --- .../notification-reason.component.scss | 14 +++--- .../notification-tab.component.scss | 10 ++-- frontend/tailwind.config.js | 48 +++++++++---------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/frontend/src/app/modules/shared/components/notification-reason/notification-reason.component.scss b/frontend/src/app/modules/shared/components/notification-reason/notification-reason.component.scss index f653f7aeeb..0b3a97fa45 100644 --- a/frontend/src/app/modules/shared/components/notification-reason/notification-reason.component.scss +++ b/frontend/src/app/modules/shared/components/notification-reason/notification-reason.component.scss @@ -121,7 +121,7 @@ } .message--text__left { - @apply bg-receivedLight text-receivedDark; + @apply bg-closedLight text-closedDark; float: left; } @@ -133,7 +133,7 @@ left: -7px; height: 25px; border-left: 20px solid; - @apply border-receivedLight; + @apply border-closedLight; border-bottom-right-radius: 16px 14px; transform: translate(0, -2px); } @@ -180,11 +180,11 @@ } &--CANCELED { - @apply bg-closedDark text-closedLight before:bg-closedLight; + @apply bg-declinedLight text-declinedDark before:bg-declinedDark; } &--CLOSED { - @apply bg-closedDark text-closedLight before:bg-closedLight; + @apply bg-closedLight text-closedDark before:bg-closedDark; } &--CREATED { @@ -196,15 +196,15 @@ } &--ACCEPTED { - @apply bg-declinedLight text-declinedDark before:bg-declinedDark; + @apply bg-confirmedLight text-confirmedDark before:bg-confirmedDark; } &--ACKNOWLEDGED { - @apply bg-pendingLight text-pendingDark before:bg-pendingDark; + @apply bg-receivedLight text-receivedDark before:bg-receivedDark; } &--DECLINED { - @apply bg-confirmedLight text-confirmedDark before:bg-confirmedDark; + @apply bg-declinedLight text-declinedDark before:bg-declinedDark; } } diff --git a/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.scss b/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.scss index f17e925a6b..61c015869b 100644 --- a/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.scss +++ b/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.scss @@ -39,11 +39,11 @@ } &--CANCELED { - @apply bg-closedDark text-closedLight before:bg-closedLight; + @apply bg-declinedLight text-declinedDark before:bg-declinedDark; } &--CLOSED { - @apply bg-closedDark text-closedLight before:bg-closedLight; + @apply bg-closedLight text-closedDark before:bg-closedDark; } &--CREATED { @@ -55,14 +55,14 @@ } &--ACCEPTED { - @apply bg-declinedLight text-declinedDark before:bg-declinedDark; + @apply bg-confirmedLight text-confirmedDark before:bg-confirmedDark; } &--ACKNOWLEDGED { - @apply bg-pendingLight text-pendingDark before:bg-pendingDark; + @apply bg-receivedLight text-receivedDark before:bg-receivedDark; } &--DECLINED { - @apply bg-confirmedLight text-confirmedDark before:bg-confirmedDark; + @apply bg-declinedLight text-declinedDark before:bg-declinedDark; } } diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index e30d48ed49..0c4cee7b38 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -19,24 +19,24 @@ /* eslint-disable no-undef */ module.exports = { - content: ['./src/**/*.html', './src/**/*.scss'], + content: [ './src/**/*.html', './src/**/*.scss' ], theme: { extend: { fontFamily: { - bold: ['Catena-X Bold', 'sans-serif'], - boldItalic: ['Catena-X BoldItalic', 'sans-serif'], + bold: [ 'Catena-X Bold', 'sans-serif' ], + boldItalic: [ 'Catena-X BoldItalic', 'sans-serif' ], - italic: ['Catena-X Italic', 'sans-serif'], - regular: ['Catena-X Regular', 'sans-serif'], + italic: [ 'Catena-X Italic', 'sans-serif' ], + regular: [ 'Catena-X Regular', 'sans-serif' ], - light: ['Catena-X Light', 'sans-serif'], - lightItalic: ['Catena-X LightItalic', 'sans-serif'], + light: [ 'Catena-X Light', 'sans-serif' ], + lightItalic: [ 'Catena-X LightItalic', 'sans-serif' ], - medium: ['Catena-X Medium', 'sans-serif'], - mediumItalic: ['Catena-X MediumItalic', 'sans-serif'], + medium: [ 'Catena-X Medium', 'sans-serif' ], + mediumItalic: [ 'Catena-X MediumItalic', 'sans-serif' ], - semiBold: ['Catena-X SemiBold', 'sans-serif'], - semiBoldItalic: ['Catena-X SemiBoldItalic', 'sans-serif'], + semiBold: [ 'Catena-X SemiBold', 'sans-serif' ], + semiBoldItalic: [ 'Catena-X SemiBoldItalic', 'sans-serif' ], }, minHeight: { 0: '0', @@ -131,23 +131,23 @@ module.exports = { // Status colors for notification badges - createdLight: '#f2f3fb', - createdDark: '#111111', + createdLight: '#d4eaff', + createdDark: '#0a2e4f', - receivedLight: '#e1f1fe', - receivedDark: '#2b4078', + receivedLight: '#fff5d6', + receivedDark: '#8b5e00', - pendingLight: '#FFECBD', - pendingDark: '#975b26', + pendingLight: '#ffe4b2', + pendingDark: '#cc5200', - confirmedLight: '#e2f6c7', - confirmedDark: '#5c8d46', + confirmedLight: '#d9f2d9', + confirmedDark: '#0b5e0b', - declinedLight: '#fee7e2', - declinedDark: '#ff5330', + declinedLight: '#ffd9d9', + declinedDark: '#b30000', - closedLight: '#ffffff', - closedDark: '#5d3416', + closedLight: '#f0f0f0', + closedDark: '#4a4a4a', qualityTypeOk: '#3db014', qualityTypeMinor: '#ffd74a', @@ -161,7 +161,7 @@ module.exports = { severityLifeThreatening: '#E5231D', semanticDataModelSerialPart: '#3db014', - semanticDataModelBatch: '#ffd21d' + semanticDataModelBatch: '#ffd21d', }, screens: { sm: '640px', From ff4630aca8cfa66cf823f30686046146d7350512 Mon Sep 17 00:00:00 2001 From: Martin Maul Date: Wed, 26 Jun 2024 16:32:11 +0200 Subject: [PATCH 2/3] chore(uux): 913 notification status colors change --- .../notification-reason.component.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/modules/shared/components/notification-reason/notification-reason.component.scss b/frontend/src/app/modules/shared/components/notification-reason/notification-reason.component.scss index 0b3a97fa45..5fc4cc56fd 100644 --- a/frontend/src/app/modules/shared/components/notification-reason/notification-reason.component.scss +++ b/frontend/src/app/modules/shared/components/notification-reason/notification-reason.component.scss @@ -91,7 +91,7 @@ } .message--text__right { - @apply bg-createdLight text-createdDark; + @apply bg-closedLight text-closedDark; float: right; } @@ -102,7 +102,7 @@ right: -7px; height: 25px; border-right: 20px solid; - @apply border-createdLight; + @apply border-closedLight; border-bottom-left-radius: 16px 14px; transform: translate(0, -2px); } @@ -121,7 +121,7 @@ } .message--text__left { - @apply bg-closedLight text-closedDark; + @apply bg-createdLight text-createdDark; float: left; } @@ -133,7 +133,7 @@ left: -7px; height: 25px; border-left: 20px solid; - @apply border-closedLight; + @apply border-createdLight; border-bottom-right-radius: 16px 14px; transform: translate(0, -2px); } From 858face76c13138772c78e0d9e17d1d3fe9ea637 Mon Sep 17 00:00:00 2001 From: Martin Maul Date: Fri, 28 Jun 2024 13:31:54 +0200 Subject: [PATCH 3/3] chore(uux): 913 notification status colors change --- .../notification-reason/notification-reason.component.scss | 6 +++--- .../notification-tab/notification-tab.component.scss | 6 +++--- frontend/tailwind.config.js | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/modules/shared/components/notification-reason/notification-reason.component.scss b/frontend/src/app/modules/shared/components/notification-reason/notification-reason.component.scss index 5fc4cc56fd..9ad6d0daa3 100644 --- a/frontend/src/app/modules/shared/components/notification-reason/notification-reason.component.scss +++ b/frontend/src/app/modules/shared/components/notification-reason/notification-reason.component.scss @@ -180,7 +180,7 @@ } &--CANCELED { - @apply bg-declinedLight text-declinedDark before:bg-declinedDark; + @apply bg-canceledLight text-canceledDark before:bg-canceledDark; } &--CLOSED { @@ -192,7 +192,7 @@ } &--SENT { - @apply bg-pendingLight text-pendingDark before:bg-pendingDark; + @apply bg-receivedLight text-receivedDark before:bg-receivedDark; } &--ACCEPTED { @@ -200,7 +200,7 @@ } &--ACKNOWLEDGED { - @apply bg-receivedLight text-receivedDark before:bg-receivedDark; + @apply bg-pendingLight text-pendingDark before:bg-pendingDark; } &--DECLINED { diff --git a/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.scss b/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.scss index 61c015869b..fec721e552 100644 --- a/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.scss +++ b/frontend/src/app/modules/shared/modules/notification/notification-tab/notification-tab.component.scss @@ -39,7 +39,7 @@ } &--CANCELED { - @apply bg-declinedLight text-declinedDark before:bg-declinedDark; + @apply bg-canceledLight text-canceledDark before:bg-canceledDark; } &--CLOSED { @@ -51,7 +51,7 @@ } &--SENT { - @apply bg-pendingLight text-pendingDark before:bg-pendingDark; + @apply bg-receivedLight text-receivedDark before:bg-receivedDark; } &--ACCEPTED { @@ -59,7 +59,7 @@ } &--ACKNOWLEDGED { - @apply bg-receivedLight text-receivedDark before:bg-receivedDark; + @apply bg-pendingLight text-pendingDark before:bg-pendingDark; } &--DECLINED { diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index 0c4cee7b38..3585d1dd5a 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -143,6 +143,9 @@ module.exports = { confirmedLight: '#d9f2d9', confirmedDark: '#0b5e0b', + canceledLight: '#ffa6a6', + canceledDark: '#800000', + declinedLight: '#ffd9d9', declinedDark: '#b30000',