fix(button): Removed double text-color (#51)

gathering · Oct 10, 2024 · 5f21db5 · 5f21db5
1 parent 2409124
commit 5f21db5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/components/Box.astro b/src/components/Box.astro
@@ -10,6 +10,7 @@ interface Props {
   textColor?: string;
   button?: {
     text: string;
+    textcolor?: string;
     link: string;
     color?: string;
     border?: boolean;
@@ -29,6 +30,7 @@ const {
 } = Astro.props;
 const itemCenterProps = itemCenter ? "items-center" : "items-start";
 const borderProps = button?.border ? "border-white border" : "";
+const buttonTextColor = button?.textcolor ? button.textcolor : "text-black";
 ---
 
 <div class={`${backgroundColor} p-4 rounded-xl flex flex-col space-y-2 `}>
@@ -41,8 +43,7 @@ const borderProps = button?.border ? "border-white border" : "";
         {button && (
           <a
             href={button.link}
-            class={`${button?.color} ${borderProps} inline-block text-white px-4 py-2 rounded-full content-center`}
-          >
+            class={`${buttonTextColor} ${button?.color} ${borderProps} inline-block px-4 py-2 rounded-full content-center`}>
             {button.text}
           </a>
         )}
@@ -57,8 +58,7 @@ const borderProps = button?.border ? "border-white border" : "";
         {button && (
           <a
             href={button.link}
-            class={`${button?.color} ${borderProps} inline-block text-white px-4 py-2 rounded-full content-center`}
-          >
+            class={`${button?.color} ${borderProps} inline-block text-white px-4 py-2 rounded-full content-center`}>
             {button.text}
           </a>
         )}

diff --git a/src/components/sections/CrewDescriptionComp.astro b/src/components/sections/CrewDescriptionComp.astro
@@ -23,7 +23,7 @@ const { image } = Astro.props;
       button={{
         text: "Ta en titt på årets crewbeskrivelser",
         link: "https://wannabe.gathering.org/tg25/crew",
-        color: "bg-blue-400 self-center text-black",
+        color: "bg-blue-400 self-center",
       }}
       backgroundColor="bg-black bg-opacity-90"
     />

diff --git a/src/components/sections/CrewJoinComp.astro b/src/components/sections/CrewJoinComp.astro
@@ -23,7 +23,7 @@ const { image } = Astro.props;
       button={{
         text: "Ta utfordringen!",
         link: "https://wannabe.gathering.org",
-        color: "bg-orange-500 self-center text-black",
+        color: "bg-orange-500 self-center",
       }}
       backgroundColor="bg-black bg-opacity-90"
     />

diff --git a/src/components/sections/TechBlogComp.astro b/src/components/sections/TechBlogComp.astro
@@ -23,7 +23,7 @@ const { image } = Astro.props;
       button={{
         text: "Les alt i Tech-bloggen",
         link: "https://tech.gathering.org",
-        color: "bg-green-500 self-center text-black",
+        color: "bg-green-500 self-center",
       }}
       backgroundColor="bg-black bg-opacity-90"
     />