Merge pull request #85 from doras-to/staging

frontend bugs with text colour on links
dorasto · Dec 23, 2023 · 5e004ba · 5e004ba
2 parents 593a15b + a623170
commit 5e004ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/components/linkspage/LinksButton.tsx b/src/components/linkspage/LinksButton.tsx
@@ -8,7 +8,7 @@ interface Props {
     text: string;
     href: string;
     bgColor: string;
-    textColor: string;
+    textColor?: string;
     Icon: string;
     className: string;
     style: any;

diff --git a/src/components/users_page/index.astro b/src/components/users_page/index.astro
@@ -162,11 +162,11 @@ if (!user_user.theme.font || user_user.theme.font.font.length == 0) {
                                     if (link.colour?.toggle) {
                                         let userstyle: any = { backgroundColor: link.colour.background, color: getTextColorForBackground(link.colour.background) };
                                         if (user_user.theme.inset) {
-                                            userstyle = { backgroundColor: link.colour.background, borderWidth: "2px", borderColor: user_user.theme.button, color: getTextColorForBackground(user_user.theme.button) };
+                                            userstyle = { backgroundColor: link.colour.background, borderWidth: "2px", borderColor: user_user.theme.button, color: getTextColorForBackground(user_user.theme.background) };
                                         }
-                                        return <LinksButton client:load id={user_user.id} verifiedData={VerifiedlinksData} link={link} style={userstyle} className={user_user.theme.button_rounded} text={link.name} textColor="black" href={link.url || ""} bgColor="primary-500" Icon={link.icon || ""} />;
+                                        return <LinksButton client:load id={user_user.id} verifiedData={VerifiedlinksData} link={link} style={userstyle} className={user_user.theme.button_rounded} text={link.name} href={link.url || ""} bgColor="primary-500" Icon={link.icon || ""} />;
                                     }
-                                    return <LinksButton client:load id={user_user.id} verifiedData={VerifiedlinksData} link={link} style={style} className={user_user.theme.button_rounded} text={link.name} textColor="black" href={link.url || ""} bgColor="primary-500" Icon={link.icon || ""} />;
+                                    return <LinksButton client:load id={user_user.id} verifiedData={VerifiedlinksData} link={link} style={style} className={user_user.theme.button_rounded} text={link.name} href={link.url || ""} bgColor="primary-500" Icon={link.icon || ""} />;
                                 }
                             })
                     }