Skip to content

Commit

Permalink
refactor: home, relay-question font color 일괄 대응
Browse files Browse the repository at this point in the history
  • Loading branch information
semnil5202 committed Aug 20, 2024
1 parent c45d6a7 commit 7df4ee8
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use client';

import { Txt } from '@sambad/sds/components';
import { colors } from '@sds/theme';

import { GatherMemberProfileList } from '../components/GatherMemberProfile/GatherMemberProfileList';
import { useGatherMemberProfileListService } from '../services/useGatherMemberProfileListService';
Expand All @@ -14,7 +15,7 @@ export const GatherMemberProfileListContainer = () => {

return (
<section css={{ width: '100%', padding: '18px 20px 12px' }}>
<Txt as="p" typography="subtitle1" css={{ marginBottom: '14px' }}>
<Txt as="p" typography="subtitle1" color={colors.grey800} css={{ marginBottom: '14px' }}>
모임원 프로필
</Txt>
<GatherMemberProfileList memberList={gatherMemberList} />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Txt } from '@sambad/sds/components';
import { colors, borderRadiusVariants } from '@sambad/sds/theme';
import { borderRadiusVariants, colors } from '@sambad/sds/theme';
import Link from 'next/link';

import { AngleRightIcon } from '../../../../../../../core/sds/src/components/Icon/assets/AngleRight';
Expand Down Expand Up @@ -31,7 +31,9 @@ export const HomePreviousQuestionItem = ({ question }: HomePreviousQuestionItemP
<div css={{ flex: '1' }}>
<Txt as="p" typography="heading3" color={colors.tertiary500} css={{ marginBottom: '4px' }}>
{content}
<Txt typography="title2">이/가 가장 많았어요.</Txt>
<Txt typography="title2" color={colors.black}>
이/가 가장 많았어요.
</Txt>
</Txt>
<Txt as="p" typography="body3" color={colors.grey600} css={{ marginBottom: '8px' }}>
{title}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const TopPreviousQuestionListContainer = () => {
<Txt
as="p"
typography="subtitle1"
color={colors.grey800}
css={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '12px' }}
>
이전 질문
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Txt } from '@sambad/sds/components';
import { colors } from '@sds/theme';
import { HTMLAttributes, ReactNode } from 'react';

interface ProgressingQuestionInfoProps extends HTMLAttributes<HTMLDivElement> {
Expand All @@ -8,7 +9,7 @@ interface ProgressingQuestionInfoProps extends HTMLAttributes<HTMLDivElement> {
export const ProgressingQuestionInfo = ({ renderQuestion, ...rest }: ProgressingQuestionInfoProps) => {
return (
<div {...rest}>
<Txt typography="subtitle1" as="p" css={{ marginBottom: '8px' }}>
<Txt typography="subtitle1" color={colors.black} as="p" css={{ marginBottom: '8px' }}>
진행 중인 릴레이 질문
</Txt>
{renderQuestion}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ export const QuestionDetail = ({
}: QuestionDetailProps) => {
return (
<div css={wrapperCss}>
<Txt typography="heading3" fontWeight="bold">
<Txt typography="heading3" color={colors.black} fontWeight="bold">
질문 미리보기
</Txt>
<div css={imageWrapperCss}>
<Image src={imageUrl} alt={title} width={64} height={64} />
</div>
<Txt typography="heading2" fontWeight="bold" css={{ textAlign: 'center' }}>
<Txt typography="heading2" color={colors.black} fontWeight="bold" css={{ textAlign: 'center' }}>
{title}
</Txt>
<Txt color={colors.grey500} typography="title4" fontWeight="medium" css={answerExampleTextCss}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Txt } from '@sambad/sds/components';
import { colors } from '@sds/theme';
import Image from 'next/image';
import { useRouter, useSearchParams } from 'next/navigation';

Expand Down Expand Up @@ -47,7 +48,7 @@ export const Questioner = ({ meetingId, meetingMemberId, imageUrl, name }: Quest
<div css={imgWrapperCss}>
<Image src={imageUrl} alt={name} width={40} height={40} />
</div>
<Txt typography="title2" fontWeight="medium">
<Txt typography="title2" color={colors.black} fontWeight="medium">
{name}
</Txt>
</li>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { css } from '@emotion/react';
import { Button, Txt } from '@sambad/sds/components';
import { size } from '@sambad/sds/theme';
import { colors, size } from '@sambad/sds/theme';
import Image from 'next/image';

import { RelayRePickQuestioner } from '../../../../assets/RelayRePickQuestioner';
Expand Down Expand Up @@ -30,7 +30,7 @@ export const QuestionerDetail = ({
<div css={imgWrapperCss}>
<Image src={imageUrl} alt={name} width={80} height={80} />
</div>
<Txt typography="heading2" fontWeight="bold" css={nameCss}>
<Txt typography="heading2" color={colors.black} fontWeight="bold" css={nameCss}>
{name}
</Txt>
<div css={buttonWrapperCss}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const NextQuestionerList = () => {
return (
<section>
<div css={questionTextBoxCss}>
<Txt typography="heading1" fontWeight="bold">
<Txt typography="heading1" color={colors.black} fontWeight="bold">
다음 릴레이 질문인은 <br />
누구로 할까요?
</Txt>
Expand Down

0 comments on commit 7df4ee8

Please sign in to comment.