style improvements, especially in Cascade

wbbaker · Oct 7, 2024 · f8fc507 · f8fc507
1 parent fea5155
commit f8fc507
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/modules/otus/components/Breadcrumb/Breadcrumb.vue b/src/modules/otus/components/Breadcrumb/Breadcrumb.vue
@@ -11,7 +11,7 @@
       />
       <router-link
         v-if="item.length === 1"
-        class="inline-flex items-center text-sm text-accent-100 hover:text-gray-900 dark:hover:text-gray-500 text-secondary-color"
+        class="inline-flex items-center text-sm hover:text-gray-900 dark:hover:text-gray-500 text-secondary-color"
         :to="{ name: 'otus-id', params: { id: item[0].id } }"
       >
         {{ key }}

diff --git a/src/modules/otus/components/Panel/PanelDescendants/DescendantsTree.vue b/src/modules/otus/components/Panel/PanelDescendants/DescendantsTree.vue
@@ -9,7 +9,7 @@
       class="absolute -left-2.5"
     />
     <router-link
-      class="text-primary-500"
+      class="hover:text-gray-900 text-secondary-color"
       :to="{ name: 'otus-id', params: { id: taxonomy.otu_id } }"
       v-html="taxonomy.name"
     />

diff --git a/src/modules/otus/components/Panel/PanelSpecimens/PanelSpecimens.vue b/src/modules/otus/components/Panel/PanelSpecimens/PanelSpecimens.vue
@@ -9,17 +9,23 @@
     </ClientOnly>
     <VCardHeader class="flex justify-between">
       <h2 class="text-md">
+        {{ (void (isSinglePage = typeof total === 'number' && total < perPage && page === 1)) }}
+        {{ (void (isLoaded = Array.isArray(inventoryDWC))) }}
         In the Collection
-        <template v-if="Array.isArray(inventoryDWC)">
-          <span v-if="typeof total === 'number' && total < perPage && page === 1">
+        <template v-if="isLoaded">
+          <span v-if="isSinglePage">
             ({{total}})
           </span>
           <span v-else>
+            ({{ (page - 1) * perPage + 1}}–{{(page - 1) * perPage + inventoryDWC.length}} of {{total}})
+          </span>
+          </template>
+      </h2>
+      <h3 v-if="isLoaded && !isSinglePage">
             {{ void(showFirst = page > 1) }}
             {{ void(showPrev = page > 1) }}
             {{ void(showNext = inventoryDWC.length === perPage) }}
             {{ void(showLast = showNext && typeof total === 'number' && total > (page - 1) * perPage + inventoryDWC.length) }}
-            ({{ (page - 1) * perPage + 1}}–{{(page - 1) * perPage + inventoryDWC.length}} of {{total}})
             <span v-if="showPrev || showNext" class="ml-2">
               <router-link
                   v-if="showFirst"
@@ -54,9 +60,7 @@
                 />
               <span v-if="!showLast" v-html="'>>'" class="ml-2"/>
             </span>
-          </span>
-        </template>
-      </h2>
+      </h3>
       <PanelDropdown panel-key="panel:specimens" />
     </VCardHeader>
     <VCardContent class="text-sm">

diff --git a/src/modules/otus/components/Panel/PanelSpecimens/SpecimenSummary.vue b/src/modules/otus/components/Panel/PanelSpecimens/SpecimenSummary.vue
@@ -6,7 +6,7 @@ For further reference see https://dwc.tdwg.org/terms/.
 <template>
   <!--    <ul class="tree m-2 ml-6 list-disc">-->
   <div v-html="nameAndAuthor(specimen)"/>
-  <ul class="tree m-2 ml-6 relative">
+  <ul class="tree ml-6 relative">
     <li class="my-2">{{ describeSpecimen(specimen) }}</li>
     <li class="my-2">{{describeDetails(specimen).join(', ')}}</li>
     <GalleryImage