From 83ed15094b7ad77e079e029707da135f20708fbc Mon Sep 17 00:00:00 2001 From: "CITE\\spapacharalampous" Date: Tue, 3 Sep 2024 15:47:08 +0300 Subject: [PATCH] styling fixes on dialog close buttons --- ...ion-template-preview-dialog.component.html | 2 +- .../annotation-dialog.component.html | 2 +- .../description-copy-dialog.component.html | 9 ++-- .../description-copy-dialog.component.scss | 18 +------- ...description-template-dialog.component.html | 12 ++--- ...description-template-dialog.component.scss | 4 -- ...tart-new-description-dialog.component.html | 4 +- ...tart-new-description-dialog.component.scss | 12 ----- .../ui/faq/dialog/faq-dialog.component.html | 10 ++--- .../ui/faq/dialog/faq-dialog.component.scss | 2 +- .../plan-clone-dialog.component.html | 6 ++- .../plan-clone-dialog.component.scss | 13 ------ .../plan-invitation-dialog.component.html | 6 +-- .../plan-invitation-dialog.component.scss | 13 ------ .../plan-new-version-dialog.component.html | 6 ++- .../plan-new-version-dialog.component.scss | 13 ------ .../start-new-plan-dialog.component.html | 8 ++-- .../start-new-plan-dialog.component.scss | 12 ----- .../plan-delete-dialog.component.html | 18 ++++---- .../plan-delete-dialog.component.scss | 44 ------------------- .../reference-dialog-editor.component.html | 6 +-- .../reference-dialog-editor.component.scss | 3 -- .../add-account-dialog.component.html | 2 +- .../add-account-dialog.component.scss | 9 ---- ...rm-validation-errors-dialog.component.html | 12 ++--- ...rm-validation-errors-dialog.component.scss | 5 --- .../confirmation-dialog.component.html | 14 +++--- .../confirmation-dialog.component.scss | 9 ---- .../multiple-choice-dialog.component.html | 6 +-- 29 files changed, 68 insertions(+), 212 deletions(-) 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 a25f8a7e9..0cdd713e5 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 @@ -1,5 +1,5 @@
-
+
{{'DESCRIPTION-TEMPLATE-PREVIEW.TEMPLATE' | translate}} - {{descriptionTemplate.label}}
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 766ebd2c4..4cadec168 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 @@ -14,7 +14,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 7fe92037c..6f23a837d 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 @@ -1,8 +1,11 @@
-
-
{{'DESCRIPTION-COPY-DIALOG.TITLE' | translate}}
-
close
+
+
{{'DESCRIPTION-COPY-DIALOG.TITLE' | translate}}
+
+ +
+
diff --git a/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.scss b/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.scss index a50f59dfa..d28fc193c 100644 --- a/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.scss +++ b/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.scss @@ -2,12 +2,8 @@ padding-bottom: 20px; } -.close-btn { - cursor: pointer; -} - .description-copy-dialog { - margin-bottom: 1.125rem; + margin: 1.125rem 0; } .cancel-btn { @@ -35,15 +31,3 @@ min-width: 101px; background-color: var(--primary-color); color: #ffffff; } - -.close-icon { - cursor: pointer; - padding: .4rem; - width: auto !important; - height: auto !important; -} - -.close-icon:hover { - background-color: #ECECED !important; - border-radius: 50%; -} 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 70e7c6135..f2838029b 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 @@ -1,10 +1,10 @@
-
-
+
+

{{ 'DESCRIPTION-EDITOR.DEPRECATED-DESCRIPTION-TEMPLATE.TITLE' | translate}} {{ data.label }}

-
- close +
+
@@ -18,9 +18,9 @@
- +
- +
diff --git a/frontend/src/app/ui/description/editor/description-base-fields-editor/dialog-description-template/deprecated-description-template-dialog.component.scss b/frontend/src/app/ui/description/editor/description-base-fields-editor/dialog-description-template/deprecated-description-template-dialog.component.scss index ae3e36775..e69de29bb 100644 --- a/frontend/src/app/ui/description/editor/description-base-fields-editor/dialog-description-template/deprecated-description-template-dialog.component.scss +++ b/frontend/src/app/ui/description/editor/description-base-fields-editor/dialog-description-template/deprecated-description-template-dialog.component.scss @@ -1,4 +0,0 @@ - -.close-btn:hover{ - cursor: pointer; -} 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 4fe431f0c..e5f22127f 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 @@ -1,10 +1,10 @@
-
+
{{'DASHBOARD.SELECT-PLAN' | translate}}
- close +
diff --git a/frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.scss b/frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.scss index 06942d777..88f53aa19 100644 --- a/frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.scss +++ b/frontend/src/app/ui/description/start-new-description-dialog/start-new-description-dialog.component.scss @@ -12,18 +12,6 @@ width: 8.44rem; } -.close-icon { - cursor: pointer; - padding: .4rem; - width: auto !important; - height: auto !important; -} - -.close-icon:hover { - background-color: #ECECED !important; - border-radius: 50%; -} - .content { margin: 2.17rem 0rem 1.1875rem 0rem; } 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 940d2087a..c3e0eaee5 100644 --- a/frontend/src/app/ui/faq/dialog/faq-dialog.component.html +++ b/frontend/src/app/ui/faq/dialog/faq-dialog.component.html @@ -1,16 +1,16 @@
-
-
+
+
{{'FAQ.TITLE' | translate}}
-
- close +
+
-
+
diff --git a/frontend/src/app/ui/faq/dialog/faq-dialog.component.scss b/frontend/src/app/ui/faq/dialog/faq-dialog.component.scss index df5ad000c..e52488eeb 100644 --- a/frontend/src/app/ui/faq/dialog/faq-dialog.component.scss +++ b/frontend/src/app/ui/faq/dialog/faq-dialog.component.scss @@ -27,7 +27,7 @@ } .faq { - margin-bottom: 1.125rem; + margin: 1.125rem 0; } .cancel-btn { 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 1d76a5575..0227cd929 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 @@ -1,7 +1,9 @@
-
+
{{'PLAN-CLONE-DIALOG.TITLE' | translate}}
- close +
+ +
diff --git a/frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.scss b/frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.scss index 9503e020a..235ab2f6f 100644 --- a/frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.scss +++ b/frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.scss @@ -21,19 +21,6 @@ margin-bottom: 0.625rem; } - .close-icon { - cursor: pointer; - margin-right: 20px; - padding: .4rem; - width: auto !important; - height: auto !important; - } - - .close-icon:hover { - background-color: #ECECED !important; - border-radius: 50%; - } - .cancel-btn { min-width: 101px; height: 43px; 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 652569ad4..60d4ff67c 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 @@ -1,10 +1,10 @@
-
+

{{'PLAN-USER-INVITATION-DIALOG.TITLE' | translate}}

-
- close +
+
diff --git a/frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.scss b/frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.scss index 13cd0d659..7437e5b05 100644 --- a/frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.scss +++ b/frontend/src/app/ui/plan/invitation/dialog/plan-invitation-dialog.component.scss @@ -7,24 +7,11 @@ padding: 0.28em 0.34em 0em 1.125em; } - .close-icon { - cursor: pointer; - padding: .4rem; - width: auto !important; - height: auto !important; - } - - .close-icon:hover { - background-color: #ECECED !important; - border-radius: 50%; - } - .title { font-size: 2.375em; font-weight: lighter; color: #000000; opacity: 0.8; - margin-bottom: 0.842em; } .content { 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 a2e06a47d..c251658c1 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 @@ -1,7 +1,9 @@
-
+
{{'PLAN-NEW-VERSION-DIALOG.TITLE' | translate}}
- close +
+ +
diff --git a/frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.scss b/frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.scss index cf2556245..e982fba88 100644 --- a/frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.scss +++ b/frontend/src/app/ui/plan/new-version-dialog/plan-new-version-dialog.component.scss @@ -21,19 +21,6 @@ margin-bottom: 0.625rem; } - .close-icon { - cursor: pointer; - margin-right: 20px; - padding: .4rem; - width: auto !important; - height: auto !important; - } - - .close-icon:hover { - background-color: #ECECED !important; - border-radius: 50%; - } - .cancel-btn { min-width: 101px; height: 43px; diff --git a/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.html b/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.html index 52a199e65..aac85914c 100644 --- a/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.html +++ b/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.html @@ -1,8 +1,8 @@
-
- close +
+
@@ -17,7 +17,7 @@
- @@ -28,7 +28,7 @@
- diff --git a/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.scss b/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.scss index aa272281c..e9fa54f0d 100644 --- a/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.scss +++ b/frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.scss @@ -19,18 +19,6 @@ width: 8.44rem; } -.close-icon { - cursor: pointer; - padding: .4rem; - width: auto !important; - height: auto !important; -} - -.close-icon:hover { - background-color: #ECECED !important; - border-radius: 50%; -} - .content { margin: 2.17rem 2.304rem 1.1875rem 3.065rem; } 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 0ed022ab4..22488d7fe 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 @@ -1,10 +1,10 @@ -
-
-
- {{'PLAN-DELETE-DIALOG.WARNING' | translate}} - close -
+
+
{{'PLAN-DELETE-DIALOG.WARNING' | translate}}
+
+
+
+
{{'PLAN-DELETE-DIALOG.DELETE-ITEM' | translate}}
@@ -16,7 +16,7 @@
-
-
+
+
-
+ diff --git a/frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.scss b/frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.scss index 45bf261df..e69de29bb 100644 --- a/frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.scss +++ b/frontend/src/app/ui/plan/plan-delete-dialog/plan-delete-dialog.component.scss @@ -1,44 +0,0 @@ -.plan-delete-dialog { - - padding: 24px; - overflow: hidden; - - .confirmation { - padding-bottom: 20px; - } - - .close-btn { - margin-left: auto; - cursor: pointer; - } - - .cancel { - background-color: #aaaaaa; - color: #ffffff; - } - - .cancel-btn { - min-width: 101px; - height: 43px; - background: #ffffff; - border: 1px solid #b5b5b5; - border-radius: 30px; - opacity: 1; - } - - - .delete { - background-color: #ba2c2c; - color: #ffffff; - } - - .delete-btn { - min-width: 101px; - height: 43px; - background: #ffffff; - color: #ba2c2c; - border: 1px solid #ba2c2c; - border-radius: 30px; - opacity: 1; - } -} 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 a8dc5fc90..636135c67 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 @@ -1,11 +1,11 @@
-
+
{{'REFERENCE-FIELD.REFERENCE-DIALOG-EDITOR.TITLE' | translate}} {{label}}
-
- close +
+
diff --git a/frontend/src/app/ui/reference/reference-field/editor/reference-dialog-editor.component.scss b/frontend/src/app/ui/reference/reference-field/editor/reference-dialog-editor.component.scss index b1538a730..e69de29bb 100644 --- a/frontend/src/app/ui/reference/reference-field/editor/reference-dialog-editor.component.scss +++ b/frontend/src/app/ui/reference/reference-field/editor/reference-dialog-editor.component.scss @@ -1,3 +0,0 @@ -.close-btn { - cursor: pointer; -} 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 e90b8a9da..92fd453dd 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 @@ -5,7 +5,7 @@ {{'USER-PROFILE.ACTIONS.LINK-NEW-ACCOUNT' | translate}}
- close +
diff --git a/frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.scss b/frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.scss index bfa745fc0..fa53b5323 100644 --- a/frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.scss +++ b/frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.scss @@ -20,15 +20,6 @@ margin-left: 37px; } - .close-icon { - cursor: pointer; - } - - .close-icon:hover { - background-color: #fefefe6e !important; - border-radius: 50%; - } - .cancel-btn { min-width: 101px; height: 43px; 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 84ea7362a..9b3c459e3 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 @@ -1,8 +1,10 @@
-
-
+
+
{{'GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.WARNING' | translate}} - close +
+
+
@@ -18,8 +20,8 @@
-
- +
+
diff --git a/frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.scss b/frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.scss index c84403459..7b8a07176 100644 --- a/frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.scss +++ b/frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.scss @@ -76,11 +76,6 @@ min-width: 101px; font-weight: 500; } -.actions { - display: flex; - flex-direction: row; -} - .error-list { margin-bottom: 0; padding-left: 1.5rem; 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 4b9f83848..2b70dd161 100644 --- a/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.html +++ b/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.html @@ -1,16 +1,16 @@
-
-
- {{ data.icon }} +
+
+
{{ data.warning }}
-
- close +
+
-
- close +
+
diff --git a/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.scss b/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.scss index c9c87a93a..d017433b4 100644 --- a/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.scss +++ b/frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.scss @@ -12,15 +12,6 @@ padding: 1em; } - .close-btn { - margin-left: auto; - cursor: pointer; - } - - .warn-text { - - } - .cancel { background-color: #aaaaaa; color: #ffffff; 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 4c2576b99..7ca5c2093 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 @@ -1,5 +1,5 @@
-
+
{{ data.icon }}
@@ -11,8 +11,8 @@
-
-
{{ data.message }}
+
+
{{ data.message }}