Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

design: 테일윈드 설정에 맞게 색상코드 설정 #94

Merged
merged 3 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/main/_components/asset-info.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export default function AssetInfo() {
<div className="mt-110">
<Link
href="/login"
className="block w-full rounded-8 bg-[#11E977] py-16 text-center text-16-700 text-white"
className="block w-full rounded-8 bg-lime-300 py-16 text-center text-16-700 text-white"
>
로그인 하기
</Link>
Expand Down Expand Up @@ -160,7 +160,7 @@ export default function AssetInfo() {
<div className="absolute top-4 ml-100">
<Image src={coinsIcon} alt="자산 아이콘" width={210} height={210} />
</div>
<div className="mt-30 flex h-105 w-264 flex-col items-center justify-center rounded-8 bg-[#11E977] p-16">
<div className="mt-30 flex h-105 w-264 flex-col items-center justify-center rounded-8 bg-lime-300 p-16">
<p className="text-14-500 text-gray-600">
{memberNickName}님의 총 자산
</p>
Expand Down
2 changes: 1 addition & 1 deletion src/app/main/_components/flucctuate-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const columns: CommonTableColumn<Fluctuation>[] = [
header: "",
width: "40px",
render: (value, row) => (
<span className="text-16-700 text-[#1DA65A]">{row.rank}</span>
<span className="text-16-700 text-green-500">{row.rank}</span>
),
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/main/_components/ranking-stock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const columns: CommonTableColumn<TradingVolume>[] = [
header: "",
width: "40px",
render: (value, row) => (
<span className="text-16-700 text-[#1DA65A]">{row.rank}</span>
<span className="text-16-700 text-green-500">{row.rank}</span>
),
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/main/_components/search-stock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function SearchStock() {
<div className="mx-auto mb-30 flex items-center justify-center">
<div className="w-full max-w-lg bg-white">
<Input
className="!border-1 !h-32 !w-437 !rounded-80 !border-[#11E977] px-17 py-23 pl-20 hover:border-[#11E977] focus:border-[#11E977]"
className="!border-1 !h-32 !w-437 !rounded-80 !border-lime-300 px-17 py-23 pl-20 hover:border-lime-300 focus:border-lime-300"
placeholder="종목명 또는 종목코드를 입력해주세요"
onKeyDown={handleKeyDown}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/app/main/_components/skeleton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function AssetInfoSkeleton() {

export function MyStockInfoSkeleton() {
return (
<div className="relative h-308 w-300 rounded-10 bg-[#F5F5F5] p-21">
<div className="relative h-308 w-300 rounded-10 bg-blue-200 p-21">
<div className="mb-10">
<div className="h-7 w-20 animate-pulse rounded bg-gray-200" />
<div className="mt-12 space-y-2">
Expand Down
10 changes: 5 additions & 5 deletions src/app/main/_components/stock-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ function MarketIndexCard({ endpoint, data }: MarketIndexCardProps) {
className={clsx(
"relative h-116 w-308 shrink-0 flex-col items-start gap-12 rounded-10 p-20",
{
"bg-[#EFF6FB]": isNegative,
"bg-[#FDEDED]": !isNegative,
"bg-blue-400": isNegative,
"bg-red-200": !isNegative,
},
)}
aria-label={`${endpoint} market index`}
Expand All @@ -40,12 +40,12 @@ function MarketIndexCard({ endpoint, data }: MarketIndexCardProps) {
</span>
<div
className={clsx("flex items-center", {
"text-[#1A00DF]": isNegative,
"text-[#F12E35]": !isNegative,
"text-blue-500": isNegative,
"text-red-500": !isNegative,
})}
>
{isNegative ? (
<ArrowDownIcon className="fill-[#1A00DF]" />
<ArrowDownIcon className="fill-blue-900" />
) : (
<ArrowUpIcon />
)}
Expand Down
4 changes: 2 additions & 2 deletions src/app/main/_components/stock-info.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default function MyStockInfo() {

if (!isAuthenticated || stockCount === "0") {
return (
<div className="relative h-308 w-300 rounded-10 bg-[#F5F5F5] p-21">
<div className="relative h-308 w-300 rounded-10 bg-red-300 p-21">
<div className="mb-10">
<h2 className="text-20-700">내 투자</h2>
<p className="mt-12 text-14-600">
Expand All @@ -119,7 +119,7 @@ export default function MyStockInfo() {
}

return (
<div className="relative h-auto min-h-308 w-300 rounded-10 bg-[#F5F5F5] p-21">
<div className="relative h-auto min-h-308 w-300 rounded-10 bg-red-300 p-21">
<div className="mb-10">
<h2 className="text-20-700">내 투자</h2>
<p className="mt-12 text-14-600">
Expand Down
2 changes: 1 addition & 1 deletion src/app/my-account/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ export default function Layout({
}: Readonly<{
children: React.ReactNode;
}>) {
return <div className="lg:max-w-2000 h-full bg-[#F5F6F8]">{children}</div>;
return <div className="lg:max-w-2000 h-full bg-blue-200">{children}</div>;
}
2 changes: 1 addition & 1 deletion src/app/portfolio/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ export default function Layout({
}: Readonly<{
children: React.ReactNode;
}>) {
return <div className="lg:max-w-2000 h-full bg-[#F5F6F8]">{children}</div>;
return <div className="lg:max-w-2000 h-full bg-blue-200">{children}</div>;
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function PriceTypeDropdown({
return (
<div className="flex gap-8">
{orderType === TradeType.Edit ? (
<span className="mb-4 grow rounded-2 border border-solid border-[#B6B6B6] p-13 text-left">
<span className="mb-4 grow rounded-2 border border-solid border-gray-100 p-13 text-left">
지정가
</span>
) : (
Expand All @@ -31,7 +31,7 @@ export default function PriceTypeDropdown({
</Dropdown.Wrapper>
</Dropdown>
)}
<span className="mb-4 w-100 rounded-2 border border-solid border-[#B6B6B6] p-13">
<span className="mb-4 w-100 rounded-2 border border-solid border-gray-100 p-13">
시장가
</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default function TutorialModal({ isOpen, onClose }: TutorialModalProps) {
<button
type="button"
onClick={handlePrev}
className="flex items-center gap-4 rounded-md border border-gray-300 px-8 py-4 text-16-600 text-gray-700 hover:bg-gray-50"
className="flex items-center gap-4 rounded-md border border-gray-300 px-8 py-4 text-16-600 text-gray-800 hover:bg-gray-50"
>
<ChevronLeft className="size-16" />
이전
Expand Down
2 changes: 1 addition & 1 deletion src/app/search/[id]/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ export default function Layout({
}: Readonly<{
children: React.ReactNode;
}>) {
return <div className="lg:max-w-2000 bg-[#F5F6F8]">{children}</div>;
return <div className="lg:max-w-2000 bg-blue-200">{children}</div>;
}
6 changes: 3 additions & 3 deletions src/app/search/_components/stock-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default function StockTable({ initialData }: Props) {
width: "60px",
align: "center",
render: (value) => (
<span className="text-15-400 font-medium text-[#757575]">{value}</span>
<span className="text-15-400 font-medium text-gray-400">{value}</span>
),
},
{
Expand All @@ -48,7 +48,7 @@ export default function StockTable({ initialData }: Props) {
<span className="text-15-600 mr-2 hover:text-blue-600">
{row.stockName}
</span>
<div className="inline-flex items-center rounded bg-[#E8F5E9] px-2 py-0.5">
<div className="inline-flex items-center rounded bg-green-200 px-2 py-0.5">
<span className="whitespace-nowrap text-14-600 text-black">
주식
</span>
Expand Down Expand Up @@ -95,7 +95,7 @@ export default function StockTable({ initialData }: Props) {
<TableHeader
columns={columns}
className="h-12"
cellClassName="px-6 text-15-500 text-[#757575] font-normal"
cellClassName="px-6 text-15-500 text-gray-800 font-normal"
/>
<TableBody
columns={columns}
Expand Down
12 changes: 6 additions & 6 deletions src/components/auth-input/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const EmailInput = memo(({ control, error }: FormInputProps) => {
<Input
{...field}
id="memberEmail"
className="h-66 w-full rounded-10 bg-[#F3F4F6]"
className="h-66 w-full rounded-10 bg-blue-400"
placeholder="이메일"
type="email"
error={error}
Expand All @@ -51,7 +51,7 @@ export const PasswordInput = memo(({ control, error }: FormInputProps) => {
<Input
{...field}
id="memberPassword"
className="mt-15 h-66 w-full rounded-10 bg-[#F3F4F6]"
className="mt-15 h-66 w-full rounded-10 bg-blue-400"
placeholder="비밀번호"
type="password"
error={error}
Expand All @@ -78,7 +78,7 @@ export const NameInput = memo(({ control, error }: FormInputProps) => {
<Input
{...field}
id="memberName"
className="mt-15 h-66 w-full rounded-10 bg-[#F3F4F6]"
className="mt-15 h-66 w-full rounded-10 bg-blue-400"
placeholder="이름"
type="text"
error={error}
Expand All @@ -105,7 +105,7 @@ export const NicknameInput = memo(({ control, error }: FormInputProps) => {
<Input
{...field}
id="memberNickName"
className="mt-15 h-66 w-full rounded-10 bg-[#F3F4F6]"
className="mt-15 h-66 w-full rounded-10 bg-blue-400"
placeholder="닉네임"
type="text"
error={error}
Expand Down Expand Up @@ -143,7 +143,7 @@ export const ConfirmPasswordInput = memo(
<Input
{...field}
id="confirmPassword"
className="mt-15 h-66 w-full rounded-10 bg-[#F3F4F6]"
className="mt-15 h-66 w-full rounded-10 bg-blue-400"
placeholder="비밀번호 확인"
type="password"
error={passwordMatchError || error}
Expand Down Expand Up @@ -188,7 +188,7 @@ export const AnnualIncomeInput = memo(({ control, error }: FormInputProps) => {
onChange(wonValue);
}}
id="annualIncome"
className="h-66 w-full rounded-lg bg-[#F3F4F6] pr-24"
className="h-66 w-full rounded-lg bg-blue-400 pr-24"
placeholder="연간 소득"
type="text"
error={error}
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/auth/refresh-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const ModalContent = memo(
onClick={handleLogout}
className={clsx(
"rounded-lg border border-gray-300 px-8 py-6",
"text-16-600 text-gray-700",
"text-16-600 text-gray-800",
"transition",
"hover:bg-gray-50",
"active:bg-gray-100",
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/button/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ export default function Button({
className={cn(
"inline-flex items-center justify-center rounded-md px-8 transition-colors focus:outline-none",
{
"bg-[#0FED60] text-black hover:bg-[#0FED88]":
"bg-green-400 text-black hover:bg-green-600":
variant === "primary" && !isDisabled,
"bg-gray-200 text-gray-800 hover:bg-gray-300":
variant === "secondary" && !isDisabled,
"bg-white text-blue-600 border border-blue-600 hover:bg-blue-50":
variant === "outline" && !isDisabled,
"bg-white text-black border border-[#B6B6B6] hover:bg-[#B6B6B6]/10 !rounded-4 px-24 py-9":
"bg-white text-black border border-gray-100 hover:bg-gray-100/10 !rounded-4 px-24 py-9":
variant === "outline-gray" && !isDisabled,
"text-white !rounded-4 px-24 py-9":
variant === "custom" && !isDisabled,
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/carousel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,11 @@ function Carousel({
<button
type="button"
onClick={nextSlide}
className="rounded-full p-1 hover:bg-gray-100 disabled:opacity-50"
className="rounded-full p-1 disabled:opacity-50"
aria-label="Next slide"
disabled={isTransitioning}
>
<Arrowright className="stroke-[#B6B6B6]" />
<Arrowright className="stroke-gray-100" />
</button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/dropdown/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function Toggle({
className={cn(
"mb-4 flex w-full items-center justify-between rounded-2 text-left",
{
"border border-solid border-[#B6B6B6] p-13": border === true,
"border border-solid border-gray-100 p-13": border === true,
},
className,
)}
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/input/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
<input
className={cn(
isForm
? "pb-2 flex-1 border-b border-solid border-[#505050] placeholder:text-right focus:outline-none text-right pr-18"
: "w-full rounded-lg py-2 pl-13 pr-10 leading-tight text-gray-700 border border-gray-300 bg-white focus:border-green-500 focus:outline-none",
? "pb-2 flex-1 border-b border-solid border-gray-600 placeholder:text-right focus:outline-none text-right pr-18"
: "w-full rounded-lg py-2 pl-13 pr-10 leading-tight text-gray-800 border border-gray-300 bg-white focus:border-green-500 focus:outline-none",
error
? "border-red-500 focus:border-red-500"
: "focus:shadow-outline",
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/tabs/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function TabsTrigger({
type="button"
className={cn(
"px-13 py-8 rounded-2",
isActive ? backgroundColors[buttonColor] : "text-[#B6B6B6]",
isActive ? backgroundColors[buttonColor] : "text-gray-100",
rounded === "md" && "rounded-4",
padding === "md" && "px-16 py-4",
className,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function TutorialContent({ step }: TutorialContentProps) {
<div className="space-y-20">
{step.content.map((item, idx) => (
<div key={`${step.title}-content-${idx}`}>
<h4 className="text-16-600 text-gray-700 mb-10">{item.subtitle}</h4>
<h4 className="text-16-600 text-gray-800 mb-10">{item.subtitle}</h4>
<p className="text-14-500 text-gray-600">{item.description}</p>
</div>
))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export default function TutorialModal({ isOpen, onClose }: TutorialModalProps) {
<button
type="button"
onClick={handlePrev}
className="flex items-center gap-4 rounded-md border border-gray-300 px-8 py-4 text-16-600 text-gray-700 hover:bg-gray-50"
className="flex items-center gap-4 rounded-md border border-gray-300 px-8 py-4 text-16-600 text-gray-800 hover:bg-gray-50"
>
<ChevronLeft className="size-16" />
이전
Expand Down
2 changes: 1 addition & 1 deletion src/components/nav-bar/_components/nav-icon-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function IconButtonComponent({
type="button"
className={clsx(
"flex flex-col items-center justify-center p-2",
isActive ? "text-[#24d075]" : "text-gray-500 hover:text-zinc-900",
isActive ? "text-lime-100" : "text-gray-500 hover:text-zinc-900",
className,
)}
{...props}
Expand Down
2 changes: 1 addition & 1 deletion src/components/nav-bar/_components/nav-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const NavItem = memo(
isActive: boolean;
}) => (
<li className="relative flex w-82 justify-center">
{isActive && <div className="absolute left-4 h-full w-3 bg-[#26db7a]" />}
{isActive && <div className="absolute left-4 h-full w-3 bg-lime-200" />}
<NavLink
href={href}
icon={icon}
Expand Down
Loading