Align the colors

louisgv · Jun 5, 2023 · 679dcf8 · 679dcf8 · vercel · Jun 5, 2023
1 parent 6e715b2
commit 679dcf8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 23 deletions.
diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
@@ -27,17 +27,7 @@ tracing = "0.1.36"
 tracing-subscriber = "0.3.15"
 url = "2.3.1"
 kv = { version = "0.24.0", features = ["json-value"] }
-tauri = { version = "1.3.0", features = [
-  "dialog-message",
-  "dialog-open",
-  "http-all",
-  "os-all",
-  "updater",
-  "window-center",
-  "window-maximize",
-  "window-set-title",
-  "window-show",
-] }
+tauri = { version = "1.3.0", features = ["dialog-message", "dialog-open", "http-all", "os-all", "updater", "window-center", "window-maximize", "window-set-title", "window-show"] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 anyhow = "1.0.71"

diff --git a/apps/desktop/src/features/layout/index.tsx b/apps/desktop/src/features/layout/index.tsx
@@ -1,6 +1,6 @@
 import { Button } from "@localai/ui/button"
 import { AppLayout } from "@localai/ui/layouts/app"
-import { GearIcon, OpenInNewWindowIcon } from "@radix-ui/react-icons"
+import { DotsHorizontalIcon, OpenInNewWindowIcon } from "@radix-ui/react-icons"
 import { open as dialogOpen } from "@tauri-apps/api/dialog"
 import { invoke } from "@tauri-apps/api/tauri"
 import { Home } from "iconoir-react"
@@ -32,7 +32,7 @@ const TopBar = () => {
           }
           await updateThreadsDirectory(selected)
         }}>
-        <GearIcon />
+        <DotsHorizontalIcon />
       </Button>
       <Button
         title="Open threads directory"

diff --git a/apps/desktop/src/features/layout/view.tsx b/apps/desktop/src/features/layout/view.tsx
@@ -21,7 +21,7 @@ export const ViewHeader = ({ children = null as ReactNode }) => {
   } = useGlobal()
   return (
     <div
-      data-tauri-drag-region
+      // data-tauri-drag-region
       className="flex items-center gap-2 bg-gray-1 w-full h-16 shrink-0 px-4 border-b border-b-gray-6 z-50">
       {isStarted && (
         <Button onClick={() => toggleSidebar()}>

diff --git a/apps/desktop/src/features/thread/message-block.tsx b/apps/desktop/src/features/thread/message-block.tsx
@@ -33,17 +33,17 @@ export const MessageBlock = ({
         className={cn(
           "px-4 py-3 rounded-md rounded-tr-none w-full transition-colors",
           isUser && "bg-gray-4 hover:bg-gray-5 text-gray-11 hover:text-gray-12",
-          isBot && "bg-blue-7 hover:bg-blue-8 text-blue-11 hover:text-blue-12",
-          isNote && "bg-gold-4 hover:bg-gold-5 text-gold-11 hover:text-gold-12"
+          isNote && "bg-gold-7 hover:bg-gold-8 text-gold-11 hover:text-gold-12",
+          isBot && "bg-blue-7 hover:bg-blue-8 text-blue-11 hover:text-blue-12"
         )}>
         <MarkdownContainer>{children}</MarkdownContainer>
       </div>
       <Button
         className={cn(
           "transition-colors rounded-l-none",
           isUser && "bg-gray-3 hover:bg-gray-4",
-          isBot && "bg-blue-6 hover:bg-blue-7 text-blue-11 hover:text-blue-12",
-          isNote && "bg-gold-6 hover:bg-gold-7 text-gold-11 hover:text-gold-12"
+          isNote && "bg-gold-6 hover:bg-gold-7 text-gold-11 hover:text-gold-12",
+          isBot && "bg-blue-6 hover:bg-blue-7 text-blue-11 hover:text-blue-12"
         )}>
         {isUser && <User />}
         {isBot && <BotIcon />}

diff --git a/apps/desktop/src/features/thread/prompt-textarea.tsx b/apps/desktop/src/features/thread/prompt-textarea.tsx
@@ -63,7 +63,7 @@ export const PromptTextarea = ({
       />
       <div className="flex flex-col h-full justify-between">
         <Button
-          className="border border-cyan-9 text-cyan-9 disabled:border-gray-9 disabled:text-gray-9 disabled:cursor-not-allowed"
+          className="border border-gold-9 text-gold-9 disabled:border-gold-9 disabled:text-gold-9 disabled:cursor-not-allowed"
           disabled={disabled || !prompt}
           onClick={note}>
           <Notes />

diff --git a/apps/desktop/src/views/chat.tsx b/apps/desktop/src/views/chat.tsx
@@ -6,9 +6,9 @@ import {
   Cpu,
   ElectronicsChip,
   ElectronicsTransistor,
-  EmojiLookDown,
   FavouriteBook,
-  Palette
+  Palette,
+  Pokeball
 } from "iconoir-react"
 import { useMemo } from "react"
 
@@ -20,7 +20,7 @@ import { useActiveThread } from "~features/thread/use-active-thread"
 const botIconList = [
   BreadSlice,
   CoffeeCup,
-  EmojiLookDown,
+  Pokeball,
   ElectronicsTransistor,
   ElectronicsChip,
   Cpu,

diff --git a/apps/desktop/src/views/model-manager.tsx b/apps/desktop/src/views/model-manager.tsx
@@ -38,7 +38,7 @@ export function ModelManagerView() {
   return (
     <ViewContainer className="relative z-50">
       <ViewHeader>
-        <div className="flex">
+        <div className="flex w-full">
           {!!modelsDirectory && (
             <SpinnerButton
               className="w-10 p-3 rounded-r-none"