Merge branch 'develop' into feat/conversation-screen

2024-12-10 18:55:04 -08:00
parent f54f7c8907 ccb117d36a
commit da79e49e3e
34 changed files with 769 additions and 101 deletions
@@ -785,7 +785,7 @@ watch(conversationFilters, (newVal, oldVal) => {
    class="flex flex-col flex-shrink-0 border-r conversations-list-wrap rtl:border-r-0 rtl:border-l border-n-weak dark:border-n-weak"
    :class="[
      { hidden: !showConversationList },
-      isOnExpandedLayout ? 'basis-full' : 'flex-basis-clamp',
+      isOnExpandedLayout ? 'basis-full' : 'w-[360px]',
    ]"
  >
    <ChatListHeader
@@ -916,12 +916,3 @@ watch(conversationFilters, (newVal, oldVal) => {
    </Teleport>
  </div>
 </template>
-
-<style scoped>
-@tailwind components;
-@layer components {
-  .flex-basis-clamp {
-    flex-basis: clamp(20rem, 4vw + 21.25rem, 27.5rem);
-  }
-}
-</style>