improve style conflicts (#724, #378)

josStorer · Aug 4, 2024 · 58090d4 · 58090d4
1 parent 4e7410f
commit 58090d4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/src/components/ConversationCard/index.jsx b/src/components/ConversationCard/index.jsx
@@ -334,24 +334,26 @@ function ConversationCard(props) {
           }}
         >
           {props.closeable ? (
-            <XLg
+            <span
               className="gpt-util-icon"
               title={t('Close the Window')}
-              size={16}
               onClick={() => {
                 port.disconnect()
                 if (props.onClose) props.onClose()
               }}
-            />
+            >
+              <XLg size={16} />
+            </span>
           ) : props.dockable ? (
-            <Pin
+            <span
               className="gpt-util-icon"
               title={t('Pin the Window')}
-              size={16}
               onClick={() => {
                 if (props.onDock) props.onDock()
               }}
-            />
+            >
+              <Pin size={16} />
+            </span>
           ) : (
             <img src={logo} style="user-select:none;width:20px;height:20px;" />
           )}
@@ -412,10 +414,9 @@ function ConversationCard(props) {
               <LinkExternalIcon size={16} />
             </a>
           )}
-          <WindowDesktop
+          <span
             className="gpt-util-icon"
             title={t('Float the Window')}
-            size={16}
             onClick={() => {
               const position = { x: window.innerWidth / 2 - 300, y: window.innerHeight / 2 - 200 }
               const toolbarContainer = createElementAtPosition(position.x, position.y)
@@ -431,7 +432,9 @@ function ConversationCard(props) {
                 toolbarContainer,
               )
             }}
-          />
+          >
+            <WindowDesktop size={16} />
+          </span>
           <DeleteButton
             size={16}
             text={t('Clear Conversation')}

diff --git a/src/content-script/styles.scss b/src/content-script/styles.scss
@@ -1251,6 +1251,12 @@
     cursor: pointer;
     align-items: center;
     z-index: 0;
+
+    svg {
+      z-index: 0;
+      color: var(--font-color);
+      background-color: var(--theme-color);
+    }
   }
 
   .normal-button {
@@ -1431,6 +1437,7 @@
   background-color: var(--theme-color);
   color: var(--toolbar-color);
   cursor: pointer;
+  z-index: 2147483647;
 }
 
 .chatgptbox-selection-toolbar-button:hover {