Merge branch 'dev' into cw-2267-support-darkmode

daostack · Nov 16, 2023 · 320de6d · 320de6d
2 parents 43ff266 + 689b653
commit 320de6d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/pages/common/components/ChatComponent/ChatComponent.module.scss b/src/pages/common/components/ChatComponent/ChatComponent.module.scss
@@ -23,6 +23,7 @@
 
   @include big-phone {
     margin-bottom: 0;
+    padding: 0.5rem 0.75rem 0 0.5rem;
   }
 }
 

diff --git a/src/shared/components/Chat/ChatMessage/ChatMessage.module.scss b/src/shared/components/Chat/ChatMessage/ChatMessage.module.scss
@@ -107,24 +107,24 @@
   font-size: $xxsmall-2;
   color: $c-gray-60;
   direction: ltr;
-  margin: 0 4.25rem;
+  margin: 0 1.25rem;
 }
 
 .messageName {
   font-size: $xsmall;
   font-weight: 600;
   color: var(--primary-text);
   margin-right: 2.5rem;
-  margin-left: 1rem;
+  margin-left: 0.75rem;
   margin-bottom: 0.5rem;
   cursor: pointer;
 }
 
 .messageContent {
   word-wrap: break-word;
   white-space: pre-line;
-  margin-right: 1rem;
-  margin-left: 1rem;
+  margin-right: 0.75rem;
+  margin-left: 0.75rem;
   word-break: break-word;
 }
 
@@ -135,7 +135,8 @@
 
 .messageContentCurrentUser {
   color: $white;
-  margin-right: 2.5rem;
+  margin-right: 0.5rem;
+  margin-top: 0.5rem;
 }
 
 .mentionText {
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ @@
       @include big-phone {
         margin-bottom: 0;
+        padding: 0.5rem 0.75rem 0 0.5rem;
       }
     }
@@ Expand Down @@