From 43256edb13fe5758d030fc4e3409dd48a9c5a90a Mon Sep 17 00:00:00 2001
From: josc146 <josStorer@outlook.com>
Date: Sat, 13 May 2023 16:11:40 +0800
Subject: [PATCH] style: more prominent conversations (#329)

---
 src/components/ConversationCard/index.jsx | 16 ++++++-------
 src/content-script/styles.scss            | 29 +++++++++++++++++++----
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/components/ConversationCard/index.jsx b/src/components/ConversationCard/index.jsx
index 15e7cc7..eeb3803 100644
--- a/src/components/ConversationCard/index.jsx
+++ b/src/components/ConversationCard/index.jsx
@@ -59,8 +59,8 @@ function ConversationCard(props) {
       else {
         const ret = []
         for (const record of session.conversationRecords) {
-          ret.push(new ConversationItemData('question', record.question + '\n<hr/>', true))
-          ret.push(new ConversationItemData('answer', record.answer + '\n<hr/>', true))
+          ret.push(new ConversationItemData('question', record.question, true))
+          ret.push(new ConversationItemData('answer', record.answer, true))
         }
         return ret
       }
@@ -139,7 +139,7 @@ function ConversationCard(props) {
         setSession(msg.session)
       }
       if (msg.done) {
-        updateAnswer('\n<hr/>', true, 'answer', true)
+        updateAnswer('', true, 'answer', true)
         setIsReady(true)
       }
       if (msg.error) {
@@ -151,7 +151,7 @@ function ConversationCard(props) {
               }<br>${t('And refresh this page or type you question again')}` +
                 `<br><br>${t(
                   'Consider creating an api key at https://platform.openai.com/account/api-keys',
-                )}\n<hr/>`,
+                )}`,
               false,
               'error',
             )
@@ -165,7 +165,7 @@ function ConversationCard(props) {
               }<br>${t('And refresh this page or type you question again')}` +
                 `<br><br>${t(
                   'Consider creating an api key at https://platform.openai.com/account/api-keys',
-                )}\n<hr/>`,
+                )}`,
               false,
               'error',
             )
@@ -174,11 +174,11 @@ function ConversationCard(props) {
             if (
               conversationItemData[conversationItemData.length - 1].content.includes('gpt-loading')
             )
-              updateAnswer(msg.error + '\n<hr/>', false, 'error')
+              updateAnswer(msg.error, false, 'error')
             else
               setConversationItemData([
                 ...conversationItemData,
-                new ConversationItemData('error', msg.error + '\n<hr/>'),
+                new ConversationItemData('error', msg.error),
               ])
             break
         }
@@ -392,7 +392,7 @@ function ConversationCard(props) {
         port={port}
         reverseResizeDir={props.pageMode}
         onSubmit={(question) => {
-          const newQuestion = new ConversationItemData('question', question + '\n<hr/>')
+          const newQuestion = new ConversationItemData('question', question)
           const newAnswer = new ConversationItemData(
             'answer',
             `<p class="gpt-loading">${t('Waiting for response...')}</p>`,
diff --git a/src/content-script/styles.scss b/src/content-script/styles.scss
index 16fb210..47ed1d2 100644
--- a/src/content-script/styles.scss
+++ b/src/content-script/styles.scss
@@ -7,6 +7,7 @@
     @import 'highlight.js/scss/github-dark.scss';
     --font-color: #c9d1d9;
     --theme-color: #202124;
+    --question-bg-color: #2d2e33;
     --theme-border-color: #3c4043;
     --dragbar-color: #3c4043;
     --color-neutral-muted: rgba(110, 118, 129, 0.4);
@@ -16,6 +17,7 @@
     @import 'highlight.js/scss/github.scss';
     --font-color: #24292f;
     --theme-color: #eaecf0;
+    --question-bg-color: #e2e4e8;
     --theme-border-color: #aeafb2;
     --dragbar-color: #dfe0e1;
     --color-neutral-muted: rgba(150, 160, 170, 0.3);
@@ -29,6 +31,7 @@
 
   --font-color: #c9d1d9;
   --theme-color: #202124;
+  --question-bg-color: #2d2e33;
   --theme-border-color: #3c4043;
   --dragbar-color: #3c4043;
   --color-neutral-muted: rgba(110, 118, 129, 0.4);
@@ -41,6 +44,7 @@
 
   --font-color: #24292f;
   --theme-color: #eaecf0;
+  --question-bg-color: #e2e4e8;
   --theme-border-color: #aeafb2;
   --dragbar-color: #ccced0;
   --color-neutral-muted: rgba(150, 160, 170, 0.3);
@@ -80,14 +84,27 @@
       height: 1px;
       background-color: var(--theme-border-color);
       border: none;
-      margin: 5px 0;
+      margin: 0;
     }
   }
 
   .markdown-body {
-    padding: 5px 15px 10px;
     background-color: var(--theme-color);
     color: var(--font-color);
+    overflow-y: auto;
+
+    ::-webkit-scrollbar {
+      background-color: var(--theme-color);
+      width: 9px;
+    }
+    ::-webkit-scrollbar-thumb {
+      background-color: var(--theme-border-color);
+      border-radius: 20px;
+      border: transparent;
+    }
+    ::-webkit-scrollbar-corner {
+      background: transparent;
+    }
     &::-webkit-scrollbar {
       background-color: var(--theme-color);
       width: 9px;
@@ -100,8 +117,6 @@
     &::-webkit-scrollbar-corner {
       background: transparent;
     }
-
-    overflow-y: auto;
     p {
       color: var(--font-color);
     }
@@ -178,10 +193,14 @@
     white-space: nowrap;
   }
 
+  .question {
+    background: var(--question-bg-color);
+  }
+
   :is(.answer, .question, .error) {
     font-size: 15px;
     line-height: 1.6;
-    border-radius: 8px;
+    padding: 4px 15px;
     word-break: break-word;
 
     pre {