Merge branch 'main' into fixed-neo-avatar-on-error

kodadot · Nov 24, 2023 · 5bceda3 · 5bceda3
2 parents fa0c730 + 9c889f4
commit 5bceda3
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 56 deletions.
diff --git a/libs/ui/src/components/CardArticle/CardArticle.scss b/libs/ui/src/components/CardArticle/CardArticle.scss
diff --git a/libs/ui/src/components/CardArticle/CardArticle.vue b/libs/ui/src/components/CardArticle/CardArticle.vue
@@ -1,15 +1,18 @@
 <template>
  <a
  v-safe-href="link"
- class="article"
+ class="group block h-full no-underline border-default border-card-border-color bg-background-color hover:border-border-color"
  target="_blank"
  rel="nofollow noopener noreferrer">
- <img class="article-image" :src="image" :alt="title" />
- <div class="article-info">
- <p class="article-title">
+ <img
+ class="w-full object-cover h-56 border-b border-b-card-border-color group-hover:opacity-card-hover-opacity"
+ :src="image"
+ :alt="title" />
+ <div class="p-4">
+ <p class="leading-4.5 text-text-color font-bold">
  {{ title }}
  </p>
- <p class="is-size-7">
+ <p class="text-xs/4.5 text-text-color">
  {{ description }}
  </p>
  </div>
@@ -24,7 +27,3 @@ defineProps<{
  description: string
 }>()
 </script>
-
-<style lang="scss" scoped>
-@import './CardArticle.scss';
-</style>
diff --git a/libs/ui/src/scss/tailwind.scss b/libs/ui/src/scss/tailwind.scss
@@ -140,4 +140,10 @@
  --toggle-primary: var(--white);
  --toggle-active-switch: #363234;
  }
+
+ *,
+ :after,
+ :before {
+ border: 0 solid currentColor;
+ }
 }
diff --git a/libs/ui/tailwind.config.js b/libs/ui/tailwind.config.js
@@ -59,6 +59,13 @@ module.exports = {
  unset: 'unset',
  'card-hover-opacity': 'var(--card-hover-opacity)',
  },
+ // TODO: remove it after removing .border class from global.scss
+ borderWidth: {
+ default: '1px',
+ },
+ lineHeight: {
+ 4.5: '1.125rem',
+ },
  },
  },
  plugins: [],

diff --git a/pages/[prefix]/collection/[id]/activity.vue b/pages/[prefix]/collection/[id]/activity.vue
@@ -30,7 +30,6 @@ const image = computed(() => {
 
 definePageMeta({
  layout: 'explore-layout',
- keepalive: true,
 })
 
 useHead({

diff --git a/pages/[prefix]/collection/[id]/index.vue b/pages/[prefix]/collection/[id]/index.vue
@@ -11,7 +11,6 @@ import { usePreferencesStore } from '@/stores/preferences'
 const route = useRoute()
 definePageMeta({
  layout: 'explore-layout',
- keepalive: true,
 })
 
 const collectionid = (route.params?.id ?? '') as string