From 22b19636ddb34c7e7ee3139149b059ca5da5eadd Mon Sep 17 00:00:00 2001 From: mchouliara Date: Tue, 15 Oct 2024 17:19:19 +0300 Subject: [PATCH] fix button UI ALL views, fix button toggle group styling --- .../editor/status-editor.component.html | 6 +- .../popup/popup-notification.component.html | 2 +- .../description-status-editor.component.html | 6 +- ...ion-template-preview-dialog.component.html | 2 +- ...on-template-listing-filters.component.html | 2 +- ...description-template.dialog.component.html | 4 +- ...iption-template-type-editor.component.html | 2 +- ...mplate-type-listing-filters.component.html | 2 +- .../editor/language-editor.component.html | 6 +- .../language-listing-filters.component.html | 2 +- .../maintenance-tasks.component.html | 36 ++++----- .../plan-blueprint-editor.component.html | 2 +- ...mport-plan-blueprint.dialog.component.html | 4 +- .../plan-status-editor.component.html | 6 +- .../css-colors-editor.component.html | 2 +- .../default-user-locale-editor.component.html | 4 +- .../deposit/deposit-editor.component.html | 6 +- ...description-workflow-editor.component.html | 6 +- .../file-transformer-editor.component.html | 6 +- .../editor/logo/logo-editor.component.html | 8 +- .../plan-workflow-editor.component.html | 6 +- .../editor/tenant-editor.component.html | 6 +- ...ser-invite-to-tenant-dialog.component.html | 2 +- .../user/listing/user-listing.component.html | 2 +- .../annotation-dialog.component.html | 4 +- .../merge-email-confirmation.component.html | 2 +- .../unlink-email-confirmation.component.html | 2 +- .../contact-content.component.html | 4 +- .../app/ui/dashboard/dashboard.component.html | 2 +- .../recent-edited-activity.component.html | 2 +- .../description-copy-dialog.component.html | 4 +- ...description-template-dialog.component.html | 4 +- .../editor/description-editor.component.html | 2 +- ...form-fieldset-editor-dialog.component.html | 4 +- .../form-field/form-field.component.html | 2 +- .../new-description.component.html | 8 +- .../description-listing.component.html | 2 +- ...tart-new-description-dialog.component.html | 4 +- .../external-fetcher-source.component.html | 6 +- .../ui/faq/dialog/faq-dialog.component.html | 2 +- .../plan-clone-dialog.component.html | 4 +- .../plan-invitation-dialog.component.html | 2 +- .../plan-new-version-dialog.component.html | 4 +- .../plan-upload-dialog.component.html | 4 +- .../overview/plan-overview.component.html | 2 +- .../overview/plan-overview.component.scss | 18 +---- ...plan-contact-prefill-dialog.component.html | 4 +- .../plan-delete-dialog.component.html | 4 +- .../plan-editor.component.html | 2 +- .../plan-finalize-dialog.component.html | 4 +- .../reference-dialog-editor.component.html | 4 +- .../add-account-dialog.component.html | 4 +- .../user-profile/user-profile.component.html | 2 +- ...rm-validation-errors-dialog.component.html | 2 +- .../confirmation-dialog.component.html | 8 +- .../multiple-choice-dialog.component.html | 2 +- ...otification-template-editor.component.html | 6 +- .../notifier-list-editor.component.html | 4 +- .../inapp-notification-editor.component.html | 4 +- ...rofile-notifier-list-editor.component.html | 2 +- frontend/src/styles.scss | 75 +++++-------------- 61 files changed, 146 insertions(+), 199 deletions(-) diff --git a/frontend/src/annotation-service/ui/admin/status/editor/status-editor.component.html b/frontend/src/annotation-service/ui/admin/status/editor/status-editor.component.html index 7997d100c..ccf2a027d 100644 --- a/frontend/src/annotation-service/ui/admin/status/editor/status-editor.component.html +++ b/frontend/src/annotation-service/ui/admin/status/editor/status-editor.component.html @@ -8,16 +8,16 @@
- +
-
- diff --git a/frontend/src/app/library/notification/popup/popup-notification.component.html b/frontend/src/app/library/notification/popup/popup-notification.component.html index 0ff3c9b14..9f69324dc 100644 --- a/frontend/src/app/library/notification/popup/popup-notification.component.html +++ b/frontend/src/app/library/notification/popup/popup-notification.component.html @@ -14,6 +14,6 @@
- +
diff --git a/frontend/src/app/ui/admin/description-status/editor/description-status-editor/description-status-editor.component.html b/frontend/src/app/ui/admin/description-status/editor/description-status-editor/description-status-editor.component.html index fefcfc24c..907a1a011 100644 --- a/frontend/src/app/ui/admin/description-status/editor/description-status-editor/description-status-editor.component.html +++ b/frontend/src/app/ui/admin/description-status/editor/description-status-editor/description-status-editor.component.html @@ -6,16 +6,16 @@
- +
-
- diff --git a/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html b/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html index 7e38f08ff..6ef680b55 100644 --- a/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html +++ b/frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html @@ -13,7 +13,7 @@
- +
diff --git a/frontend/src/app/ui/admin/description-template/listing/filters/description-template-listing-filters.component.html b/frontend/src/app/ui/admin/description-template/listing/filters/description-template-listing-filters.component.html index 36e8f9d60..97a8fae0b 100644 --- a/frontend/src/app/ui/admin/description-template/listing/filters/description-template-listing-filters.component.html +++ b/frontend/src/app/ui/admin/description-template/listing/filters/description-template-listing-filters.component.html @@ -42,7 +42,7 @@
-
diff --git a/frontend/src/app/ui/admin/description-template/listing/import-description-template/import-description-template.dialog.component.html b/frontend/src/app/ui/admin/description-template/listing/import-description-template/import-description-template.dialog.component.html index fa8d9e373..9aade0bec 100644 --- a/frontend/src/app/ui/admin/description-template/listing/import-description-template/import-description-template.dialog.component.html +++ b/frontend/src/app/ui/admin/description-template/listing/import-description-template/import-description-template.dialog.component.html @@ -34,11 +34,11 @@
- +
- +
diff --git a/frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html b/frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html index 80b6786ac..f9f89be8b 100644 --- a/frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html +++ b/frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html @@ -8,7 +8,7 @@
- +
-
diff --git a/frontend/src/app/ui/admin/language/editor/language-editor.component.html b/frontend/src/app/ui/admin/language/editor/language-editor.component.html index 920c5d76e..11aa8c298 100644 --- a/frontend/src/app/ui/admin/language/editor/language-editor.component.html +++ b/frontend/src/app/ui/admin/language/editor/language-editor.component.html @@ -6,16 +6,16 @@
- +
-
- diff --git a/frontend/src/app/ui/admin/language/listing/filters/language-listing-filters.component.html b/frontend/src/app/ui/admin/language/listing/filters/language-listing-filters.component.html index c9e2da094..33540602e 100644 --- a/frontend/src/app/ui/admin/language/listing/filters/language-listing-filters.component.html +++ b/frontend/src/app/ui/admin/language/listing/filters/language-listing-filters.component.html @@ -36,7 +36,7 @@
-
diff --git a/frontend/src/app/ui/admin/maintenance-tasks/maintenance-tasks.component.html b/frontend/src/app/ui/admin/maintenance-tasks/maintenance-tasks.component.html index e67d0c345..8badb6614 100644 --- a/frontend/src/app/ui/admin/maintenance-tasks/maintenance-tasks.component.html +++ b/frontend/src/app/ui/admin/maintenance-tasks/maintenance-tasks.component.html @@ -17,8 +17,8 @@
- - + +
@@ -32,28 +32,28 @@

{{language.instant('MAINTENANCE-TASKS.SECTIONS.EVENTS.MAIN-TITLE')}}

- - - - + + + +

{{language.instant('MAINTENANCE-TASKS.SECTIONS.EVENTS.ACCOUNTING-TITLE')}}

- - - - - - - - + + + + + + + +

{{language.instant('MAINTENANCE-TASKS.SECTIONS.EVENTS.INDICATOR-TITLE')}}

- - - - + + + +
diff --git a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html index 8523e841b..0073df5a9 100644 --- a/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html +++ b/frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html @@ -235,7 +235,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
- +
diff --git a/frontend/src/app/ui/admin/plan-blueprint/listing/import-plan-blueprint/import-plan-blueprint.dialog.component.html b/frontend/src/app/ui/admin/plan-blueprint/listing/import-plan-blueprint/import-plan-blueprint.dialog.component.html index fb08c4aea..24a04e14a 100644 --- a/frontend/src/app/ui/admin/plan-blueprint/listing/import-plan-blueprint/import-plan-blueprint.dialog.component.html +++ b/frontend/src/app/ui/admin/plan-blueprint/listing/import-plan-blueprint/import-plan-blueprint.dialog.component.html @@ -34,11 +34,11 @@
- +
- +
diff --git a/frontend/src/app/ui/admin/plan-status/editor/plan-status-editor/plan-status-editor.component.html b/frontend/src/app/ui/admin/plan-status/editor/plan-status-editor/plan-status-editor.component.html index b9bce3ebc..623d63a18 100644 --- a/frontend/src/app/ui/admin/plan-status/editor/plan-status-editor/plan-status-editor.component.html +++ b/frontend/src/app/ui/admin/plan-status/editor/plan-status-editor/plan-status-editor.component.html @@ -6,16 +6,16 @@
- +
-
- diff --git a/frontend/src/app/ui/admin/tenant-configuration/editor/css-colors/css-colors-editor.component.html b/frontend/src/app/ui/admin/tenant-configuration/editor/css-colors/css-colors-editor.component.html index 17461ada0..9a73fca07 100644 --- a/frontend/src/app/ui/admin/tenant-configuration/editor/css-colors/css-colors-editor.component.html +++ b/frontend/src/app/ui/admin/tenant-configuration/editor/css-colors/css-colors-editor.component.html @@ -34,7 +34,7 @@
-
diff --git a/frontend/src/app/ui/admin/tenant-configuration/editor/default-user-locale/default-user-locale-editor.component.html b/frontend/src/app/ui/admin/tenant-configuration/editor/default-user-locale/default-user-locale-editor.component.html index fe94a6ce5..7386689ee 100644 --- a/frontend/src/app/ui/admin/tenant-configuration/editor/default-user-locale/default-user-locale-editor.component.html +++ b/frontend/src/app/ui/admin/tenant-configuration/editor/default-user-locale/default-user-locale-editor.component.html @@ -36,11 +36,11 @@
-
-
diff --git a/frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.html b/frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.html index a7e21d910..ceded3bab 100644 --- a/frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.html +++ b/frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.html @@ -9,7 +9,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
- +
@@ -94,11 +94,11 @@
-
-
diff --git a/frontend/src/app/ui/admin/tenant-configuration/editor/description-workflow/description-workflow-editor/description-workflow-editor.component.html b/frontend/src/app/ui/admin/tenant-configuration/editor/description-workflow/description-workflow-editor/description-workflow-editor.component.html index f7a42bdc1..f144112a3 100644 --- a/frontend/src/app/ui/admin/tenant-configuration/editor/description-workflow/description-workflow-editor/description-workflow-editor.component.html +++ b/frontend/src/app/ui/admin/tenant-configuration/editor/description-workflow/description-workflow-editor/description-workflow-editor.component.html @@ -16,7 +16,7 @@
- +
@@ -71,14 +71,14 @@
@if(canDelete){
-
} @if(canSave){
-
diff --git a/frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.html b/frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.html index fa0af0744..f0e870f76 100644 --- a/frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.html +++ b/frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.html @@ -9,7 +9,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
- +
@@ -78,11 +78,11 @@
-
-
diff --git a/frontend/src/app/ui/admin/tenant-configuration/editor/logo/logo-editor.component.html b/frontend/src/app/ui/admin/tenant-configuration/editor/logo/logo-editor.component.html index c41941308..6d958e982 100644 --- a/frontend/src/app/ui/admin/tenant-configuration/editor/logo/logo-editor.component.html +++ b/frontend/src/app/ui/admin/tenant-configuration/editor/logo/logo-editor.component.html @@ -7,12 +7,12 @@
- - @@ -21,11 +21,11 @@
-
-
diff --git a/frontend/src/app/ui/admin/tenant-configuration/editor/plan-workflow/plan-workflow-editor/plan-workflow-editor.component.html b/frontend/src/app/ui/admin/tenant-configuration/editor/plan-workflow/plan-workflow-editor/plan-workflow-editor.component.html index 1f6b21b9a..0baef091b 100644 --- a/frontend/src/app/ui/admin/tenant-configuration/editor/plan-workflow/plan-workflow-editor/plan-workflow-editor.component.html +++ b/frontend/src/app/ui/admin/tenant-configuration/editor/plan-workflow/plan-workflow-editor/plan-workflow-editor.component.html @@ -16,7 +16,7 @@
- +
@@ -73,14 +73,14 @@
@if(canDelete){
-
} @if(canSave){
-
diff --git a/frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.html b/frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.html index 4f1a39fc7..6c5ed3f4f 100644 --- a/frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.html +++ b/frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.html @@ -6,16 +6,16 @@
- +
-
- diff --git a/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.html b/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.html index dc5d05d5e..d11286fbe 100644 --- a/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.html +++ b/frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.html @@ -50,7 +50,7 @@
- + {{formGroup.get('users').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}}
diff --git a/frontend/src/app/ui/admin/user/listing/user-listing.component.html b/frontend/src/app/ui/admin/user/listing/user-listing.component.html index 0e55db5ab..ed8cc4b9e 100644 --- a/frontend/src/app/ui/admin/user/listing/user-listing.component.html +++ b/frontend/src/app/ui/admin/user/listing/user-listing.component.html @@ -7,7 +7,7 @@
-
diff --git a/frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html b/frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html index b43f5b15e..eded1a5d6 100644 --- a/frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html +++ b/frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html @@ -41,10 +41,10 @@
- +
- +
diff --git a/frontend/src/app/ui/auth/login/merge-email-confirmation/merge-email-confirmation.component.html b/frontend/src/app/ui/auth/login/merge-email-confirmation/merge-email-confirmation.component.html index 80010480e..7a4fdbb2a 100644 --- a/frontend/src/app/ui/auth/login/merge-email-confirmation/merge-email-confirmation.component.html +++ b/frontend/src/app/ui/auth/login/merge-email-confirmation/merge-email-confirmation.component.html @@ -14,7 +14,7 @@
- +
diff --git a/frontend/src/app/ui/auth/login/unlink-email-confirmation/unlink-email-confirmation.component.html b/frontend/src/app/ui/auth/login/unlink-email-confirmation/unlink-email-confirmation.component.html index 7049318a6..ff545580f 100644 --- a/frontend/src/app/ui/auth/login/unlink-email-confirmation/unlink-email-confirmation.component.html +++ b/frontend/src/app/ui/auth/login/unlink-email-confirmation/unlink-email-confirmation.component.html @@ -15,7 +15,7 @@
- +
diff --git a/frontend/src/app/ui/contact/contact-content/contact-content.component.html b/frontend/src/app/ui/contact/contact-content/contact-content.component.html index b1db2f7de..9cae37901 100644 --- a/frontend/src/app/ui/contact/contact-content/contact-content.component.html +++ b/frontend/src/app/ui/contact/contact-content/contact-content.component.html @@ -22,8 +22,8 @@
-
-
+
+
diff --git a/frontend/src/app/ui/dashboard/dashboard.component.html b/frontend/src/app/ui/dashboard/dashboard.component.html index 593bc8c29..70dcd1fbb 100644 --- a/frontend/src/app/ui/dashboard/dashboard.component.html +++ b/frontend/src/app/ui/dashboard/dashboard.component.html @@ -17,7 +17,7 @@
- + {{'NEW-RELEASE-NOTIFICATION.ACTIONS.LEARN-MORE' | translate}}
diff --git a/frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html index 503a6b1b5..45d13340d 100644 --- a/frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html +++ b/frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html @@ -39,7 +39,7 @@
- +
diff --git a/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.html b/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.html index ddb36b5af..cf7bc0c75 100644 --- a/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.html +++ b/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.html @@ -27,7 +27,7 @@
-
-
+
+
diff --git a/frontend/src/app/ui/description/editor/description-base-fields-editor/dialog-description-template/deprecated-description-template-dialog.component.html b/frontend/src/app/ui/description/editor/description-base-fields-editor/dialog-description-template/deprecated-description-template-dialog.component.html index 19c18cb62..3007ffbdc 100644 --- a/frontend/src/app/ui/description/editor/description-base-fields-editor/dialog-description-template/deprecated-description-template-dialog.component.html +++ b/frontend/src/app/ui/description/editor/description-base-fields-editor/dialog-description-template/deprecated-description-template-dialog.component.html @@ -18,9 +18,9 @@
- +
- +
diff --git a/frontend/src/app/ui/description/editor/description-editor.component.html b/frontend/src/app/ui/description/editor/description-editor.component.html index c5036fab5..6a5666f7f 100644 --- a/frontend/src/app/ui/description/editor/description-editor.component.html +++ b/frontend/src/app/ui/description/editor/description-editor.component.html @@ -135,7 +135,7 @@
- diff --git a/frontend/src/app/ui/description/editor/description-form/components/form-field-set/dialog-editor/form-fieldset-editor-dialog.component.html b/frontend/src/app/ui/description/editor/description-form/components/form-field-set/dialog-editor/form-fieldset-editor-dialog.component.html index 71d67ee10..4fd41be7d 100644 --- a/frontend/src/app/ui/description/editor/description-form/components/form-field-set/dialog-editor/form-fieldset-editor-dialog.component.html +++ b/frontend/src/app/ui/description/editor/description-form/components/form-field-set/dialog-editor/form-fieldset-editor-dialog.component.html @@ -29,6 +29,6 @@
-
-
+
+
diff --git a/frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html b/frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html index 47743f0b4..d2bd9332e 100644 --- a/frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html +++ b/frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html @@ -232,7 +232,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
- + {{propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('identifier').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}}
diff --git a/frontend/src/app/ui/description/editor/new-description/new-description.component.html b/frontend/src/app/ui/description/editor/new-description/new-description.component.html index 877576574..37dbbf98b 100644 --- a/frontend/src/app/ui/description/editor/new-description/new-description.component.html +++ b/frontend/src/app/ui/description/editor/new-description/new-description.component.html @@ -38,9 +38,9 @@
- +
{{'NEW-DESCRIPTION-DIALOG.OR' | translate}}
- +
@@ -66,13 +66,13 @@
- +
- +
diff --git a/frontend/src/app/ui/description/listing/description-listing.component.html b/frontend/src/app/ui/description/listing/description-listing.component.html index 9e55d07d8..523e8ee91 100644 --- a/frontend/src/app/ui/description/listing/description-listing.component.html +++ b/frontend/src/app/ui/description/listing/description-listing.component.html @@ -6,7 +6,7 @@

{{'DESCRIPTION-LISTING.TEXT-INFO' | translate}} {{'DESCRIPTION-LISTING.LINK-PUBLIC-DESCRIPTIONS' | translate}} {{'DESCRIPTION-LISTING.TEXT-INFO-REST' | translate}}

{{'DESCRIPTION-LISTING.TEXT-INFO-PAR' | translate}}

- {{('ALT-TEXT.DASHBOARD-POPUP-IMAGE' | translate) ?? 'dashboard pop up image' }} diff --git a/frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.html b/frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.html index bffa10c87..e5c7755dd 100644 --- a/frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.html +++ b/frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.html @@ -22,10 +22,10 @@
- +
- +
diff --git a/frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html b/frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html index 53210a21a..423e79b7a 100644 --- a/frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html +++ b/frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html @@ -223,7 +223,7 @@

{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.QUERIES' | translate}}

- +
@@ -265,7 +265,7 @@

{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.CASES' | translate}}

- +
@@ -393,7 +393,7 @@
- + {{'EXTERNAL-FETCHER-SOURCE-EDITOR.STATIC-ITEMS-REQUIRED' | translate}} {{formGroup.get('items').getError('backendError').message}} diff --git a/frontend/src/app/ui/faq/dialog/faq-dialog.component.html b/frontend/src/app/ui/faq/dialog/faq-dialog.component.html index 28bd26c4d..0885833f6 100644 --- a/frontend/src/app/ui/faq/dialog/faq-dialog.component.html +++ b/frontend/src/app/ui/faq/dialog/faq-dialog.component.html @@ -11,6 +11,6 @@
-
+
diff --git a/frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.html b/frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.html index 7e1ce7184..148a344d1 100644 --- a/frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.html +++ b/frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.html @@ -56,7 +56,7 @@
-
-
+
+
\ No newline at end of file diff --git a/frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.html b/frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.html index f6aab7e80..384fb4703 100644 --- a/frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.html +++ b/frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.html @@ -12,7 +12,7 @@
- + {{formGroup.get('users').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}}
diff --git a/frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.html b/frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.html index e90b23923..0736ca308 100644 --- a/frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.html +++ b/frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.html @@ -91,7 +91,7 @@
-
-
+
+
\ No newline at end of file diff --git a/frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.html b/frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.html index 5725fb624..43dedb622 100644 --- a/frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.html +++ b/frontend/src/app/ui/plan/new/upload-dialogue/plan-upload-dialog.component.html @@ -81,10 +81,10 @@
- +
- +
diff --git a/frontend/src/app/ui/plan/overview/plan-overview.component.html b/frontend/src/app/ui/plan/overview/plan-overview.component.html index 2aeb6df4a..0484bc6ba 100644 --- a/frontend/src/app/ui/plan/overview/plan-overview.component.html +++ b/frontend/src/app/ui/plan/overview/plan-overview.component.html @@ -126,7 +126,7 @@
-
+
+
\ No newline at end of file diff --git a/frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.html b/frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.html index 2efb38bb4..00dd2e16e 100644 --- a/frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.html +++ b/frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.html @@ -16,7 +16,7 @@
-
-
+
+
diff --git a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html index d306a6733..4c9a02fcc 100644 --- a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html +++ b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html @@ -177,7 +177,7 @@
- diff --git a/frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.html b/frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.html index f1b9fc372..c21805d1d 100644 --- a/frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.html +++ b/frontend/src/app/ui/plan/plan-finalize-dialog/plan-finalize-dialog.component.html @@ -87,10 +87,10 @@
- +
- +
diff --git a/frontend/src/app/ui/reference/reference-field/editor/reference-dialog-editor.component.html b/frontend/src/app/ui/reference/reference-field/editor/reference-dialog-editor.component.html index 4c34fa5ad..cce0fb041 100644 --- a/frontend/src/app/ui/reference/reference-field/editor/reference-dialog-editor.component.html +++ b/frontend/src/app/ui/reference/reference-field/editor/reference-dialog-editor.component.html @@ -64,7 +64,7 @@ -
-
+
+
diff --git a/frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.html b/frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.html index e9b679f52..aa8844e75 100644 --- a/frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.html +++ b/frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.html @@ -25,10 +25,10 @@
- +
- +
diff --git a/frontend/src/app/ui/user-profile/user-profile.component.html b/frontend/src/app/ui/user-profile/user-profile.component.html index d4efe6a0f..b7eb00e06 100644 --- a/frontend/src/app/ui/user-profile/user-profile.component.html +++ b/frontend/src/app/ui/user-profile/user-profile.component.html @@ -199,7 +199,7 @@
-
+
diff --git a/frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.html b/frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.html index 4bd23f38d..42d6af9bd 100644 --- a/frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.html +++ b/frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.html @@ -21,7 +21,7 @@
- +
diff --git a/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.html b/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.html index 17b483b62..727dcf25e 100644 --- a/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.html +++ b/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.html @@ -24,9 +24,9 @@
{{'GENERAL.CONFIRMATION-DIALOG.ACTIONS.REQUIRED' | translate}}
-
-
-
-
+
+
+
+
diff --git a/frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html b/frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html index c3712ceb9..b5918940b 100644 --- a/frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html +++ b/frontend/src/common/modules/multiple-choice-dialog/multiple-choice-dialog.component.html @@ -34,7 +34,7 @@
- +
diff --git a/frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.html b/frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.html index 1bdf6ff50..d8eb86d60 100644 --- a/frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.html +++ b/frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.html @@ -6,16 +6,16 @@
- +
-
- diff --git a/frontend/src/notification-service/ui/admin/tenant-configuration/notifier-list/notifier-list-editor.component.html b/frontend/src/notification-service/ui/admin/tenant-configuration/notifier-list/notifier-list-editor.component.html index b2c5e3477..3c35b7e8d 100644 --- a/frontend/src/notification-service/ui/admin/tenant-configuration/notifier-list/notifier-list-editor.component.html +++ b/frontend/src/notification-service/ui/admin/tenant-configuration/notifier-list/notifier-list-editor.component.html @@ -20,12 +20,12 @@
-
-
diff --git a/frontend/src/notification-service/ui/inapp-notification/editor/inapp-notification-editor.component.html b/frontend/src/notification-service/ui/inapp-notification/editor/inapp-notification-editor.component.html index d3366389a..dd2e1cf3f 100644 --- a/frontend/src/notification-service/ui/inapp-notification/editor/inapp-notification-editor.component.html +++ b/frontend/src/notification-service/ui/inapp-notification/editor/inapp-notification-editor.component.html @@ -13,12 +13,12 @@
-
-
diff --git a/frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.component.html b/frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.component.html index 4dc82308d..acba43874 100644 --- a/frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.component.html +++ b/frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.component.html @@ -19,7 +19,7 @@
-
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 7d26a7c13..8629f65a3 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -122,9 +122,12 @@ } .mat-button-toggle-group.mat-button-toggle-group-appearance-standard{ border-radius: 4px; - border-color: var(--mat-standard-button-toggle-selected-state-background-color); + border-color: var(--md-sys-color-secondary-dark); .mat-button-toggle.mat-button-toggle-appearance-standard { - border-left-color: var(--mat-standard-button-toggle-selected-state-background-color); + border-left-color: var(--md-sys-color-secondary-dark); + } + .mat-button-toggle-appearance-standard.mat-button-toggle-checked{ + background-color: var(--md-sys-color-secondary-dark); } } .mdc-icon-button { @@ -132,13 +135,16 @@ } .mat-primary.mat-mdc-outlined-button:not(:disabled){ border-color: var(--sys-primary); + background-color: rgb(255 255 255 / 40%); } .mat-warn.mat-mdc-outlined-button:not(:disabled){ border-color: var(--sys-error); + background-color: rgb(255 255 255 / 40%); } .mat-unthemed.mat-mdc-outlined-button:not(:disabled) { color: var(--sys-on-surface); border-color: var(--sys-outline); + background-color: rgb(255 255 255 / 40%); } .mat-divider.mat-divider-vertical{ border-right-color: rgba(0, 0, 0, .12) !important; @@ -430,11 +436,6 @@ a { } button, .mdc-button, .mat-mdc-button, .mdc-button:has(.material-icons,mat-icon,[matButtonIcon]), .md-button, .mat-mdc-button:not(:disabled) { - &.inverted-stroked-btn{ - border: 1px solid var(--sys-on-primary); - color: var(--sys-on-primary); - background-color: var(--sys-primary); - } &.squared-btn { border-radius: 4px; @@ -444,61 +445,13 @@ button, .mdc-button, .mat-mdc-button, .mdc-button:has(.material-icons,mat-icon,[ min-height: 40px; box-shadow: 0px 3px 6px #1E202029; } - &.primary { - background: var(--sys-primary) 0% 0% no-repeat padding-box; + + &.primary-inverted-hover:hover { + background-color: var(--sys-primary); color: var(--sys-on-primary); - border: none; - &:disabled, &.mat-mdc-button.mat-mdc-button-disabled{ - color: var(--sys-on-primary); - opacity: 0.7; - } - } - - &.secondary { - background: var(--sys-tertiary) 0% 0% no-repeat padding-box; - color: var(--sys-on-tertiary); - border: none; - &:disabled, &.mat-mdc-button.mat-mdc-button-disabled{ - color: var(--sys-on-tertiary); - opacity: 0.7; - } - } - - &.primary-inverted { - color: var(--sys-primary); - border: 1px solid var(--sys-primary); - background: var(--sys-on-primary); - &:disabled, &.mat-mdc-button.mat-mdc-button-disabled{ - color: var(--sys-primary); - opacity: 0.5; - } - &.primary-inverted-hover:hover { - background-color: var(--sys-primary); - color: var(--sys-on-primary); - } } - &.neutral{ - border: 1px solid #CBCBCB; - background: #fafafafa; - color: #000000; - &:disabled, &.mat-mdc-button.mat-mdc-button-disabled{ - color: #CBCBCB; - } - } - - &.delete { - background: var(--sys-error); - border: none; - color: #ffffff; - } - - &.delete-inverted { - background: #fafafafa; - border: 1px solid var(--sys-error); - color: var(--sys-error); - } &.import { border: 1px solid #000000; @@ -670,4 +623,10 @@ ul.unstyled-list { .container-fluid:first-child { padding: 0 !important; } +} + +.inverted-stroked-btn{ + border: 1px solid var(--sys-on-primary); + color: var(--sys-on-primary); + background-color: var(--sys-primary); } \ No newline at end of file