Skip to content

Commit 598b8d2

Browse files
committed
chore(fix): fixed and updated ui requirements for card and tag
1 parent 2cc1f7e commit 598b8d2

File tree

7 files changed

+3536
-5605
lines changed

7 files changed

+3536
-5605
lines changed

src/components/button/Button.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export const Button: React.FC<ButtonProps> = ({
4040
${variantStyles[variant]}
4141
${sizeStyles[size]}
4242
${disabled ? "opacity-50 cursor-not-allowed" : ""}
43+
${customClass}
4344
`.trim();
4445

4546
return (

src/components/card/BDPCard.tsx

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const BDPCard: React.FC<CardProps> = ({
3434
byBDP,
3535
}) => {
3636
const baseStyles = `border border-brand-stroke-on-base p-2
37-
flex min-h-[290px] w-[374px] rounded-2xl bg-brand-card-bg`;
37+
flex min-h-[290px] w-full md:max-w-[374px] rounded-2xl bg-brand-card-bg`;
3838

3939
const className = `
4040
${baseStyles}
@@ -62,8 +62,8 @@ export const BDPCard: React.FC<CardProps> = ({
6262
>
6363
<div className="flex flex-col rounded-xl border border-brand-stroke-on-base w-full min-h-full bg-brand-card-bg">
6464
<div
65-
className={`h-[126px] flex border border-l-0 border-r-0 border-t-0
66-
border-brand-stroke-on-base rounded-lg relative flex-col items-center justify-center`}
65+
className={`min-h-[126px] flex border border-l-0 border-r-0 border-t-0
66+
border-brand-stroke-on-base rounded-lg relative z-0 flex-col items-center justify-center`}
6767
style={{ backgroundColor: bannerColor }}
6868
>
6969
<div>
@@ -80,16 +80,21 @@ export const BDPCard: React.FC<CardProps> = ({
8080
)}
8181
</div>
8282
{/* Footer */}
83-
<div className="flex flex-col w-full p-3 gap-2">
84-
<div className="w-full flex items-center justify-between">
85-
<h6 className="font-montserrat text-lg font-semibold">{title}</h6>
86-
<Leaf
87-
showLeftOvers
88-
leavesCount={convertToLeavesCount(difficulty)}
89-
/>
83+
<div className="flex flex-col w-full h-full p-2 md:p-3 gap-1.5 md:gap-2 justify-between">
84+
<div className="flex flex-col gap-1.5 md:gap-2">
85+
<div className="w-full flex items-start justify-between">
86+
<h6 className="font-montserrat text-base md:text-lg font-semibold">
87+
{title}
88+
</h6>
89+
<Leaf
90+
showLeftOvers
91+
leavesCount={convertToLeavesCount(difficulty)}
92+
/>
93+
</div>
94+
<p className="font-light text-sm md:text-base font-quicksand">
95+
{description}
96+
</p>
9097
</div>
91-
<p className="font-light font-quicksand">{description}</p>
92-
9398
<div className="flex gap-[9px] flex-wrap">
9499
{tagList &&
95100
tagList.map((tag) => (

src/components/tag/Tag.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export const Tag: React.FC<TagProps> = ({
7979
? config.color
8080
: effectiveState === "hover"
8181
? config.lightColor
82-
: "white";
82+
: "transparent";
8383
const renderBorderColor = config.color;
8484

8585
return (

src/icons/stories/icon.stories.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* eslint-disable react/prop-types */
2+
13
import React from "react";
24
import { StoryObj, Meta } from "@storybook/react";
35
import * as Icons from "../../icons";

src/styles/tailwind.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#fafafa 50.33%,
4343
rgba(250, 250, 250, 0) 100%
4444
);
45+
--brand-orange-100: #eb5234;
4546
}
4647

4748
html {

tailwind.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ module.exports = {
5656
"stroke-on-base":"#E1DBD0",
5757
"card-bg":"#EFE9DE",
5858
orange:{
59-
100:"#EB5234",
59+
100:"var(--brand-orange-100)",
6060
},
6161
gray:{
6262
100:"#201E1E",

0 commit comments

Comments
 (0)