Merge pull request #88 from meetqy/87-所有-button-的-hover-跟随主题

主题更加鲜明
meetqy · Mar 30, 2024 · 492033c · 492033c
2 parents c2b4619 + 1f68099
commit 492033c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 17 deletions.
diff --git a/src/app/[lang]/author/list/[page]/page.tsx b/src/app/[lang]/author/list/[page]/page.tsx
@@ -67,14 +67,14 @@ export default async function AuthorPage({
               href={`/${params.lang}/author/${item.id}`}
               className="absolute left-0 top-0 h-full w-full"
             ></Link>
-            <div className="text-f200 flex w-full items-center justify-between">
-              {item.name}
+            <div className="flex w-full items-center justify-between text-f200">
+              <span className="text-primary">{item.name}</span>
               <span className="font-mono text-sm font-normal  text-muted-foreground">
                 {item?._count.poems}
               </span>
             </div>
 
-            <p className="text-f50 line-clamp-2 text-muted-foreground">
+            <p className="line-clamp-2 text-f50 text-muted-foreground">
               {item.introduce || "暂未完善"}
             </p>
           </div>

diff --git a/src/app/[lang]/layout.tsx b/src/app/[lang]/layout.tsx
@@ -68,11 +68,11 @@ export default async function Layout({
               <header className="h-16">
                 <Link
                   href={`/${params.lang}`}
-                  className="text-outline flex h-16 items-center justify-center font-serif text-[2.5rem] font-bold"
+                  className="text-primary-outline flex h-16 items-center justify-center font-serif text-[2.5rem] font-bold"
                   style={{ fontFamily: "Palatino,Times New Roman" }}
                 >
                   AsPoem
-                  <span className="text-muted-foreground">.com</span>
+                  <span className="text-primary">.com</span>
                 </Link>
               </header>
 

diff --git a/src/app/[lang]/tag/page.tsx b/src/app/[lang]/tag/page.tsx
@@ -82,7 +82,7 @@ export default async function Page(props: Props) {
                 <Button
                   key={item.id}
                   variant={"secondary"}
-                  className="mb-4 mr-4 text-f50"
+                  className="mb-4 mr-4"
                   asChild
                 >
                   <Link href={`tag/${item.id}`}>{item.name}</Link>

diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
@@ -15,7 +15,7 @@ const buttonVariants = cva(
         outline:
           "border border-input bg-background hover:bg-accent hover:text-accent-foreground",
         secondary:
-          "bg-secondary text-secondary-foreground hover:bg-secondary-foreground hover:text-secondary",
+          "bg-secondary text-secondary-foreground hover:bg-primary/90 hover:text-primary-foreground",
         ghost: "hover:bg-accent hover:text-accent-foreground",
         link: "text-primary underline-offset-4 hover:underline",
       },

diff --git a/src/styles/globals.css b/src/styles/globals.css
@@ -48,26 +48,20 @@
     }
   }
 
-  .text-outline {
+  .text-primary-outline {
     -webkit-text-stroke-width: 1px;
-    -webkit-text-stroke-color: hsl(var(--foreground));
-    color: transparent;
-  }
-
-  .text-outline-muted {
-    -webkit-text-stroke-width: 1px;
-    -webkit-text-stroke-color: hsl(var(--muted-foreground));
+    -webkit-text-stroke-color: hsl(var(--primary));
     color: transparent;
   }
 
   [prose-h1],
   .prose-h1 {
-    @apply text-f400 scroll-m-20 tracking-tight lg:text-5xl;
+    @apply scroll-m-20 text-f400 tracking-tight lg:text-5xl;
   }
 
   [prose-h2],
   .prose-h2 {
-    @apply text-f300 mt-12 scroll-m-20 border-b border-border pb-2 tracking-tight first:mt-0;
+    @apply mt-12 scroll-m-20 border-b border-border pb-2 text-f300 tracking-tight first:mt-0;
   }
 
   [prose-p],