From 0f57c6f2449f2cfbb3125950dfa3e8a98ba54704 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Fri, 16 Sep 2022 16:58:24 +1000
Subject: [PATCH] feat: styled conversation header and composition box

---
 stylesheets/_modules.scss              | 5 +++--
 stylesheets/_session.scss              | 2 +-
 stylesheets/_session_conversation.scss | 6 +++---
 stylesheets/_session_theme.scss        | 2 +-
 ts/themes/SessionTheme.tsx             | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index bc0d35293..aa7d5da64 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -316,7 +316,7 @@
   font-size: 16px;
   line-height: 24px;
   font-weight: 400;
-  color: var(--color-text);
+  color: var(--text-primary-color);
 
   // width of avatar (28px) and our 6px left margin
   max-width: calc(100% - 34px);
@@ -327,7 +327,7 @@
   display: flex;
   align-items: center;
 
-  -webkit-user-select: text;
+  user-select: text;
   cursor: pointer;
 
   .module-contact-name__profile-name {
@@ -347,6 +347,7 @@
 }
 
 .module-conversation-header__expiration__clock-icon {
+  // TODO Theming update
   @include color-svg('../images/timer.svg', var(--color-gray-color));
   height: 20px;
   width: 20px;
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index f57c941b6..5909c54c5 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -127,7 +127,7 @@ textarea {
   font-size: $session-font-md;
 
   &-text {
-    color: var(--color-text-subtle);
+    color: var(--text-primary-color);
     font-weight: 400;
     font-size: $session-font-sm;
     line-height: $session-font-sm;
diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index a0e42e2bd..f95700856 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -68,7 +68,7 @@
     align-items: center;
     justify-content: space-between;
     height: var(--main-view-header-height);
-    background: var(--color-cell-background);
+    background: var(--background-primary-color);
 
     .close-button {
       float: left;
@@ -159,8 +159,8 @@
   align-items: center;
   padding: 0px var(--margins-md);
   min-height: min-content;
-  background: var(--color-cell-background);
-  border-top: var(--border-session);
+  border-top: 1px solid var(--border-color);
+  border-left: 1px solid var(--border-color);
   z-index: 1;
 
   .session-icon-button {
diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss
index 67306a5b0..03a8b3123 100644
--- a/stylesheets/_session_theme.scss
+++ b/stylesheets/_session_theme.scss
@@ -3,7 +3,7 @@
   background: none !important;
 }
 .module-conversation-header {
-  background: var(--color-cell-background);
+  background: var(--background-primary-color);
 }
 
 .module-message {
diff --git a/ts/themes/SessionTheme.tsx b/ts/themes/SessionTheme.tsx
index d22ffca46..c47f17a5b 100644
--- a/ts/themes/SessionTheme.tsx
+++ b/ts/themes/SessionTheme.tsx
@@ -552,7 +552,7 @@ export const SessionGlobalStyles = createGlobalStyle`
     /* TODO Theming Consolidate with code */
     /* Conversation Tab */
     /* This is also user for Overlay Tabs, Contact Rows, Convesation List Items, Message Search Results, Session Search Input?, Message Requests Banner, Member List Item etc. */
-    --conversation-tab-background-color: ${THEMES.CLASSIC_LIGHT.COLOR5};
+    --conversation-tab-background-color: ${THEMES.CLASSIC_LIGHT.COLOR6};
     --conversation-tab-background-hover-color: ${THEMES.CLASSIC_LIGHT.COLOR4};
     --conversation-tab-background-selected-color: ${THEMES.CLASSIC_LIGHT.COLOR4};
     --conversation-tab-background-unread-color: var(--background-primary-color);