From 05614a345d3b7af82d116fed977191ce3f07b5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bel=C3=A9n=20Albeza?= <belen@hey.com>
Date: Wed, 13 Dec 2023 16:32:26 +0100
Subject: [PATCH 1/2] :bug: fix modal text color + remove lines in shared
 library modal

---
 frontend/src/app/main/data/common.cljs |  3 +--
 frontend/src/app/main/ui/confirm.scss  | 12 +++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frontend/src/app/main/data/common.cljs b/frontend/src/app/main/data/common.cljs
index baa380b7d3..2146abbcc2 100644
--- a/frontend/src/app/main/data/common.cljs
+++ b/frontend/src/app/main/data/common.cljs
@@ -106,9 +106,8 @@
                                       (:typography-count summary))]
                          (modal/show
                           {:type :confirm
-                           :message ""
                            :title (tr "modals.add-shared-confirm.message" (:name summary))
-                           :hint (if (zero? count) (tr "modals.add-shared-confirm-empty.hint") (tr "modals.add-shared-confirm.hint"))
+                           :message (if (zero? count) (tr "modals.add-shared-confirm-empty.hint") (tr "modals.add-shared-confirm.hint"))
                            :cancel-label (if (zero? count) (tr "labels.cancel") :omit)
                            :accept-label (tr "modals.add-shared-confirm.accept")
                            :accept-style :primary
diff --git a/frontend/src/app/main/ui/confirm.scss b/frontend/src/app/main/ui/confirm.scss
index 84b9b7ae60..94a4fe55a3 100644
--- a/frontend/src/app/main/ui/confirm.scss
+++ b/frontend/src/app/main/ui/confirm.scss
@@ -26,11 +26,6 @@
     .modal-content {
       @include titleTipography;
       margin-bottom: $s-24;
-      .modal-msg,
-      .modal-scd-msg,
-      .modal-subtitle {
-        @include titleTipography;
-      }
       .component-list {
         .modal-item-element {
           @include flexRow;
@@ -68,3 +63,10 @@
     }
   }
 }
+
+.modal-scd-msg,
+.modal-subtitle,
+.modal-msg {
+  @include titleTipography;
+  color: var(--modal-text-foreground-color);
+}

From 7b36a7df8b6c3ae1581b6ebc21391870390c3fe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bel=C3=A9n=20Albeza?= <belen@hey.com>
Date: Fri, 15 Dec 2023 13:15:11 +0100
Subject: [PATCH 2/2] :bug: fix line-height and color of the message text in
 all modals

---
 frontend/src/app/main/ui/alert.scss            | 13 +++++++++----
 frontend/src/app/main/ui/confirm.scss          |  1 +
 frontend/src/app/main/ui/dashboard/export.scss | 13 ++++++++-----
 frontend/src/app/main/ui/dashboard/import.scss | 13 ++++++++-----
 frontend/src/app/main/ui/delete_shared.scss    | 13 ++++++++-----
 frontend/src/app/main/ui/export.scss           | 13 +++++++++----
 frontend/src/app/main/ui/workspace/nudge.scss  |  9 ++++++---
 7 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/frontend/src/app/main/ui/alert.scss b/frontend/src/app/main/ui/alert.scss
index fd7eee9a4a..066381d194 100644
--- a/frontend/src/app/main/ui/alert.scss
+++ b/frontend/src/app/main/ui/alert.scss
@@ -26,10 +26,7 @@
     .modal-content {
       @include titleTipography;
       margin-bottom: $s-24;
-      .modal-msg,
-      .modal-scd-msg,
-      .modal-hint,
-      .modal-subtitle {
+      .modal-hint {
         @include titleTipography;
       }
     }
@@ -49,3 +46,11 @@
     }
   }
 }
+
+.modal-scd-msg,
+.modal-subtitle,
+.modal-msg {
+  @include titleTipography;
+  color: var(--modal-text-foreground-color);
+  line-height: 1.5;
+}
diff --git a/frontend/src/app/main/ui/confirm.scss b/frontend/src/app/main/ui/confirm.scss
index 94a4fe55a3..7d01aff684 100644
--- a/frontend/src/app/main/ui/confirm.scss
+++ b/frontend/src/app/main/ui/confirm.scss
@@ -69,4 +69,5 @@
 .modal-msg {
   @include titleTipography;
   color: var(--modal-text-foreground-color);
+  line-height: 1.5;
 }
diff --git a/frontend/src/app/main/ui/dashboard/export.scss b/frontend/src/app/main/ui/dashboard/export.scss
index 47a4888bd6..6d092f1679 100644
--- a/frontend/src/app/main/ui/dashboard/export.scss
+++ b/frontend/src/app/main/ui/dashboard/export.scss
@@ -25,11 +25,6 @@
     .modal-content {
       @include titleTipography;
       margin-bottom: $s-24;
-      .modal-msg,
-      .modal-scd-msg,
-      .modal-subtitle {
-        @include titleTipography;
-      }
       .export-option {
         @extend .input-checkbox;
         width: 100%;
@@ -68,6 +63,14 @@
   }
 }
 
+.modal-scd-msg,
+.modal-subtitle,
+.modal-msg {
+  @include titleTipography;
+  color: var(--modal-text-foreground-color);
+  line-height: 1.5;
+}
+
 .file-entry {
   .file-name {
     @include flexRow;
diff --git a/frontend/src/app/main/ui/dashboard/import.scss b/frontend/src/app/main/ui/dashboard/import.scss
index a8c8baf22c..3ed738462e 100644
--- a/frontend/src/app/main/ui/dashboard/import.scss
+++ b/frontend/src/app/main/ui/dashboard/import.scss
@@ -26,11 +26,6 @@
     .modal-content {
       @include titleTipography;
       margin-bottom: $s-24;
-      .modal-msg,
-      .modal-scd-msg,
-      .modal-subtitle {
-        @include titleTipography;
-      }
       .feedback-banner {
         @include flexRow;
         height: $s-32;
@@ -79,6 +74,14 @@
   }
 }
 
+.modal-scd-msg,
+.modal-subtitle,
+.modal-msg {
+  @include titleTipography;
+  color: var(--modal-text-foreground-color);
+  line-height: 1.5;
+}
+
 .file-entry {
   .file-name {
     @include flexRow;
diff --git a/frontend/src/app/main/ui/delete_shared.scss b/frontend/src/app/main/ui/delete_shared.scss
index 17c2531a79..caa20bdcbb 100644
--- a/frontend/src/app/main/ui/delete_shared.scss
+++ b/frontend/src/app/main/ui/delete_shared.scss
@@ -26,11 +26,6 @@
     .modal-content {
       @include titleTipography;
       margin-bottom: $s-24;
-      .modal-msg,
-      .modal-scd-msg,
-      .modal-subtitle {
-        @include titleTipography;
-      }
       .modal-hint {
         @extend .modal-hint-base;
       }
@@ -57,3 +52,11 @@
     }
   }
 }
+
+.modal-scd-msg,
+.modal-subtitle,
+.modal-msg {
+  @include titleTipography;
+  color: var(--modal-text-foreground-color);
+  line-height: 1.5;
+}
diff --git a/frontend/src/app/main/ui/export.scss b/frontend/src/app/main/ui/export.scss
index 01a15889a3..a14f409084 100644
--- a/frontend/src/app/main/ui/export.scss
+++ b/frontend/src/app/main/ui/export.scss
@@ -89,10 +89,7 @@
     .no-selection {
       @include titleTipography;
       margin-bottom: $s-24;
-      .modal-msg,
-      .modal-scd-msg,
-      .modal-hint,
-      .modal-subtitle {
+      .modal-hint {
         @include titleTipography;
         color: var(--modal-text-foreground-color);
       }
@@ -223,3 +220,11 @@
     }
   }
 }
+
+.modal-scd-msg,
+.modal-subtitle,
+.modal-msg {
+  @include titleTipography;
+  color: var(--modal-text-foreground-color);
+  line-height: 1.5;
+}
diff --git a/frontend/src/app/main/ui/workspace/nudge.scss b/frontend/src/app/main/ui/workspace/nudge.scss
index 042f64c2fb..ff8f775a28 100644
--- a/frontend/src/app/main/ui/workspace/nudge.scss
+++ b/frontend/src/app/main/ui/workspace/nudge.scss
@@ -28,9 +28,6 @@
       gap: $s-24;
       @include titleTipography;
       margin-bottom: $s-24;
-      .modal-msg {
-        @include titleTipography;
-      }
       .input-wrapper {
         @extend .input-with-label;
         label {
@@ -40,3 +37,9 @@
     }
   }
 }
+
+.modal-msg {
+  @include titleTipography;
+  color: var(--modal-text-foreground-color);
+  line-height: 1.5;
+}