Merged

specklesystems · Dec 20, 2024 · eea2373 · eea2373
2 parents 0fb775f + 1a3bb53
commit eea2373
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/packages/frontend-2/components/billing/Alert.vue b/packages/frontend-2/components/billing/Alert.vue
@@ -3,7 +3,7 @@
     <template v-if="!hasValidPlan">
       <div
         v-if="condensed"
-        class="flex items-center justify-between rounded-md p-2 text-body-3xs font-medium bg-[#E0ECFF] text-primary-focus"
+        class="flex items-center justify-between rounded-md p-2 text-body-3xs font-medium bg-info-lighter text-primary-focus"
       >
         {{ title }}
         <FormButton

diff --git a/packages/frontend-2/components/viewer/AnchoredPoints.vue b/packages/frontend-2/components/viewer/AnchoredPoints.vue
@@ -64,6 +64,7 @@
                 "
                 :user="user.user"
                 hover-effect
+                hide-tooltip
                 :active="user.sessionId === spotlightUserSessionId"
               />
             </button>

diff --git a/packages/frontend-2/components/workspace/ProjectList.vue b/packages/frontend-2/components/workspace/ProjectList.vue
@@ -28,7 +28,7 @@
         @show-new-project-dialog="openNewProject = true"
         @show-invite-dialog="showInviteDialog = true"
       />
-      <div v-if="projects?.totalCount" class="mt-2 lg:mt-4">
+      <div v-if="showSearchBar" class="mt-2 lg:mt-4">
         <FormTextInput
           name="modelsearch"
           :show-label="false"
@@ -221,12 +221,15 @@ const isWorkspaceGuest = computed(() => workspace.value?.role === Roles.Workspac
 const isWorkspaceAdmin = computed(() => workspace.value?.role === Roles.Workspace.Admin)
 
 const showLoadingBar = computed(() => {
-  const isLoading =
-    areQueriesLoading.value || (!!search.value && !projects.value?.items?.length)
+  const isLoading = areQueriesLoading.value || (!!search.value && query.loading.value)
 
   return isLoading
 })
 
+const showSearchBar = computed(() => {
+  return projects?.value?.totalCount || search.value
+})
+
 const clearSearch = () => {
   search.value = ''
   selectedRoles.value = []

diff --git a/packages/ui-components/src/components/common/Badge.vue b/packages/ui-components/src/components/common/Badge.vue
@@ -55,7 +55,7 @@ const props = defineProps<{
 }>()
 
 const badgeColorClasses = computed(
-  () => props.colorClasses || 'bg-info-lighter text-outline-4'
+  () => props.colorClasses || 'bg-info-lighter text-primary-focus'
 )
 
 const badgeDotIconColorClasses = computed(

diff --git a/packages/ui-components/src/components/layout/tabs/Horizontal.vue b/packages/ui-components/src/components/layout/tabs/Horizontal.vue
@@ -37,19 +37,22 @@
           :disabled="item.disabled"
           @click="setActiveItem(item)"
         >
-          <div
-            v-tippy="
-              item.disabled && item.disabledMessage ? item.disabledMessage : undefined
-            "
-            class="absolute top-0 right-0 left-0 bottom-0"
-          ></div>
           <div class="flex space-x-2 items-center">
             <component
               :is="item.icon"
               v-if="item.icon"
               class="shrink-0 h-4 w-4 stroke-[2px]"
-            ></component>
-            <span class="min-w-6">{{ item.title }}</span>
+            />
+
+            <div class="min-w-6">
+              <span
+                v-if="item.disabled && item.disabledMessage"
+                v-tippy="item.disabledMessage"
+              >
+                {{ item.title }}
+              </span>
+              <span v-else>{{ item.title }}</span>
+            </div>
             <div
               v-if="item.count"
               class="rounded-full px-2 text-body-3xs transition-all min-w-6"