fix: some buttons using wrong text colour (#917)

zkrising · Jul 30, 2023 · 0e518e0 · 0e518e0
1 parent 711048d
commit 0e518e0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 24 deletions.
diff --git a/client/src/components/util/SelectLinkButton.tsx b/client/src/components/util/SelectLinkButton.tsx
@@ -5,6 +5,7 @@ import LinkButton, { LinkButtonProps } from "./LinkButton";
 
 export default function SelectLinkButton({
 	children,
+	className,
 	onVariant = "primary",
 	offVariant = "outline-secondary",
 	to,
@@ -18,9 +19,16 @@ export default function SelectLinkButton({
 } & LinkButtonProps) {
 	const match = DoesMatchRoute(window.location.href, to, !matchIfStartsWith);
 	const variant = match ? onVariant : offVariant;
+	const classNames = `${match ? "" : "text-body"} ${className}`;
 
 	return (
-		<LinkButton to={to} isActive={() => match} variant={variant} {...props}>
+		<LinkButton
+			to={to}
+			isActive={() => match}
+			variant={variant}
+			{...props}
+			className={classNames}
+		>
 			{children}
 		</LinkButton>
 	);

diff --git a/client/src/styles/customised-bootstrap/maps.scss b/client/src/styles/customised-bootstrap/maps.scss
@@ -65,7 +65,7 @@ $utilities: map-merge(
             )
         ),
         "backdrop-blur": (
-            property: backdrop-filter,
+            property: backdrop-filter -webkit-backdrop-filter,
             class: backdrop-blur,
             values: (
                 //sm: blur(4px),

diff --git a/client/src/styles/legacy/base.scss b/client/src/styles/legacy/base.scss
@@ -1,6 +1,6 @@
 .fading-image-td-left {
 	position: relative;
-	z-index: -1;
+	z-index: 1;
 
 	&:before {
 		content: "";
@@ -22,10 +22,10 @@
 
 .fading-image-td-right {
 	position: relative;
-	z-index: -1;
+	z-index: 1;
 
 	&:before {
-		content: '';
+		content: "";
 		display: block;
 		background-image: var(--image-url);
 		mask-image: linear-gradient(to right, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
@@ -42,6 +42,22 @@
 	}
 }
 
+.expandable-pseudo-row, .nested-expandable-pseudo-row {
+	td { 
+		border: none;
+	}
+}
+
+.fake-row {
+	border: none;
+}
+
+.tr-dropdown-container {
+	padding: 4px;
+	border-bottom: #{$table-border-width} solid #{$table-border-color};
+	background-color: var(--bs-body-bg);
+}
+
 .quest-anchor {
 	scroll-margin-top: 100px;
 }
@@ -54,7 +70,7 @@
 @include media-breakpoint-up(lg) {
 	.MuiTabs-flexContainer {
 		width: 100%;
-		justify-content: space-around
+		justify-content: space-around;
 	}
 }
 
@@ -80,4 +96,4 @@
 	opacity: 0.3;
 }
 
-@import "tachi-custom/custom", "tachi-custom/hero", "tachi-custom/splash-screen", "tachi-custom/timeline.scss";
+@import "tachi-custom/custom", "tachi-custom/hero", "tachi-custom/splash-screen", "tachi-custom/timeline.scss";
diff --git a/client/src/styles/legacy/tachi-custom/_custom.scss b/client/src/styles/legacy/tachi-custom/_custom.scss
@@ -22,23 +22,6 @@
 	}
 }
 
-.fake-row {
-	td {
-		padding: 0 !important;
-		border-top: none;
-	}
-}
-
-.tr-dropdown-container {
-	padding: 4px;
-	border-top: 1px solid $table-border-color;
-	background-color: var(--bs-body-bg);
-
-	&.collapsing {
-		border-bottom: 1px solid $table-border-color;
-	}
-}
-
 .gentle-link {
 	color: var(--bs-body-color);