Merge branch 'issue-214-解决两个页面主题的同步问题' of https://github.com/MarleneJ…

…iang/ByteDream-JueJin into issue-214-解决两个页面主题的同步问题
IdeaLeap · Feb 11, 2023 · 461b8cf · 461b8cf
2 parents ca9ca1c + ed3da53
commit 461b8cf
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 17 deletions.
diff --git a/backend/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/backend/src/extensions/documentation/documentation/1.0.0/full_documentation.json
@@ -14,7 +14,7 @@
       "name": "Apache 2.0",
       "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "x-generation-date": "2023-02-10T13:24:41.880Z"
+    "x-generation-date": "2023-02-11T07:39:26.502Z"
   },
   "x-strapi-config": {
     "path": "/documentation",

diff --git a/frontend/components/ArticlesList/Item/Ads.vue b/frontend/components/ArticlesList/Item/Ads.vue
@@ -20,12 +20,3 @@ const ad = inject<IArticleAd>('ads')
     </ArticlesListUiLink>
   </li>
 </template>
-
-<style scoped>
-.title {
-  @apply truncate my-3 text-jj-font-normal text-[16px] title font-semibold tracking-wide
-}
-.summary {
-  @apply whitespace-pre-wrap mlg:max-w-[520px] text-jj_thirdly text-[13px]
-}
-</style>
diff --git a/frontend/components/ArticlesList/Item/Bar/Bottom.vue b/frontend/components/ArticlesList/Item/Bar/Bottom.vue
@@ -15,7 +15,7 @@ const format = (num: number) => {
       <div class="i-carbon-view" />
       <span class="heat">{{ viewed ? format(viewed) : '观看' }}</span>
     </div>
-    <div class="mx-7 item">
+    <div class="item">
       <div class="i-carbon-thumbs-up" />
       <span class="heat">{{ liked ? format(liked) : '点赞' }}</span>
     </div>
@@ -28,13 +28,13 @@ const format = (num: number) => {
 
 <style scoped>
 .bottombar {
-  @apply flex all-flex all-items-center
+  @apply flex all-flex
 }
 .heat {
   @apply pl-2
 }
 .item {
-  @apply text-jj_sec_app text-[13px] transition
+  @apply text-jj_sec_app text-[13px] transition pr-6
   @apply hover:text-primary
 }
 </style>
diff --git a/frontend/components/ArticlesList/Item/Bar/Center.vue b/frontend/components/ArticlesList/Item/Bar/Center.vue
@@ -11,7 +11,7 @@ defineProps<{
     <div class="title">
       {{ title }}
     </div>
-    <div class="summary">
+    <div :class="`${ad ? 'whitespace-pre-wrap' : 'truncate'}`" class="summary">
       {{ summary }}
     </div>
   </div>
@@ -22,6 +22,6 @@ defineProps<{
   @apply truncate text-jj-font-normal text-[16px] title font-semibold tracking-wide
 }
 .summary {
-  @apply truncate pt-3 text-jj_thirdly text-[13px]
+  @apply pt-3 text-jj_thirdly text-[13px]
 }
 </style>
diff --git a/frontend/components/ArticlesList/Ui/Link.vue b/frontend/components/ArticlesList/Ui/Link.vue
@@ -12,7 +12,7 @@ defineProps({
 
 <style scoped>
 .link_container {
-  @apply transition hover:bg-jj-hover f-c-c py-4 transition-all b-b b-grey all-cursor-pointer flex-1 px-[1.67rem] truncate
-  @apply dark:b-jj-gray-container-normal
+  @apply transition flex-1 f-c-c transition-all b-b b-grey all-cursor-pointer px-[1.67rem] pt-[1.25rem] pb-[0.85rem] truncate
+  @apply dark:b-jj-gray-container-normal hover:bg-jj-hover
 }
 </style>