diff --git a/src/assets/timer/normal_timer_cons.jpg b/src/assets/timer/normal_timer_cons.jpg
new file mode 100644
index 00000000..73901200
Binary files /dev/null and b/src/assets/timer/normal_timer_cons.jpg differ
diff --git a/src/assets/timer/normal_timer_cons.png b/src/assets/timer/normal_timer_cons.png
deleted file mode 100644
index 1e5ac3f6..00000000
Binary files a/src/assets/timer/normal_timer_cons.png and /dev/null differ
diff --git a/src/assets/timer/normal_timer_neutral.jpg b/src/assets/timer/normal_timer_neutral.jpg
new file mode 100644
index 00000000..bc86660f
Binary files /dev/null and b/src/assets/timer/normal_timer_neutral.jpg differ
diff --git a/src/assets/timer/normal_timer_neutral.png b/src/assets/timer/normal_timer_neutral.png
deleted file mode 100644
index 8dcaed50..00000000
Binary files a/src/assets/timer/normal_timer_neutral.png and /dev/null differ
diff --git a/src/assets/timer/normal_timer_pros.jpg b/src/assets/timer/normal_timer_pros.jpg
new file mode 100644
index 00000000..86c8f2af
Binary files /dev/null and b/src/assets/timer/normal_timer_pros.jpg differ
diff --git a/src/assets/timer/normal_timer_pros.png b/src/assets/timer/normal_timer_pros.png
deleted file mode 100644
index 2052a23f..00000000
Binary files a/src/assets/timer/normal_timer_pros.png and /dev/null differ
diff --git a/src/assets/timer/time_based_timer.jpg b/src/assets/timer/time_based_timer.jpg
new file mode 100644
index 00000000..099cc235
Binary files /dev/null and b/src/assets/timer/time_based_timer.jpg differ
diff --git a/src/assets/timer/time_based_timer.png b/src/assets/timer/time_based_timer.png
deleted file mode 100644
index 5428774b..00000000
Binary files a/src/assets/timer/time_based_timer.png and /dev/null differ
diff --git a/src/assets/timer/time_based_timer_only_total.jpg b/src/assets/timer/time_based_timer_only_total.jpg
new file mode 100644
index 00000000..ad1d246d
Binary files /dev/null and b/src/assets/timer/time_based_timer_only_total.jpg differ
diff --git a/src/components/ProsAndConsTitle/PropsAndConsTitle.tsx b/src/components/ProsAndConsTitle/PropsAndConsTitle.tsx
index 382c116a..5b53cd05 100644
--- a/src/components/ProsAndConsTitle/PropsAndConsTitle.tsx
+++ b/src/components/ProsAndConsTitle/PropsAndConsTitle.tsx
@@ -8,7 +8,7 @@ export default function PropsAndConsTitle({
consTeamName = '반대',
}: PropsAndConsTitleProps) {
return (
-
+
{prosTeamName}
diff --git a/src/components/icons/LeftArrow.tsx b/src/components/icons/LeftArrow.tsx
index a3aaabeb..c663e688 100644
--- a/src/components/icons/LeftArrow.tsx
+++ b/src/components/icons/LeftArrow.tsx
@@ -21,7 +21,7 @@ export default function DTLeftArrow({
fill={color}
/>
diff --git a/src/components/icons/RightArrow.tsx b/src/components/icons/RightArrow.tsx
index d05fa850..fb492995 100644
--- a/src/components/icons/RightArrow.tsx
+++ b/src/components/icons/RightArrow.tsx
@@ -7,21 +7,21 @@ export default function DTRightArrow({
}: IconProps) {
return (
diff --git a/src/index.css b/src/index.css
index e609214b..41c7d9bc 100644
--- a/src/index.css
+++ b/src/index.css
@@ -7,6 +7,11 @@
@apply font-pretendard;
@apply bg-default-white;
}
+
+ html,
+ body {
+ @apply text-default-black;
+ }
}
/* Text styles */
diff --git a/src/page/TableComposition/components/TimeBox/TimeBox.tsx b/src/page/TableComposition/components/TimeBox/TimeBox.tsx
index 61857cec..b371ee38 100644
--- a/src/page/TableComposition/components/TimeBox/TimeBox.tsx
+++ b/src/page/TableComposition/components/TimeBox/TimeBox.tsx
@@ -121,7 +121,7 @@ export default function TimeBox(props: TimeBoxProps) {
>
)}
@@ -132,7 +132,7 @@ export default function TimeBox(props: TimeBoxProps) {
)}
- {timeStr}
+ {timeStr}
);
@@ -151,10 +151,10 @@ export default function TimeBox(props: TimeBoxProps) {
}}
/>
-
+
{speechType}
-
{timeStr}
+
{timeStr}
);
@@ -177,10 +177,10 @@ export default function TimeBox(props: TimeBoxProps) {
>
)}
-
+
{speechType}
-
+
{fullTimeStr}
diff --git a/src/page/TableComposition/components/TimerCreationContent/TimerCreationContent.tsx b/src/page/TableComposition/components/TimerCreationContent/TimerCreationContent.tsx
index 2f46da86..e1bf32b1 100644
--- a/src/page/TableComposition/components/TimerCreationContent/TimerCreationContent.tsx
+++ b/src/page/TableComposition/components/TimerCreationContent/TimerCreationContent.tsx
@@ -8,10 +8,11 @@ import {
BellConfig,
} from '../../../../type/type';
import { Formatting } from '../../../../util/formatting';
-import normalTimerProsImage from '../../../../assets/timer/normal_timer_pros.png';
-import normalTimerConsImage from '../../../../assets/timer/normal_timer_cons.png';
-import normalTimerNeutralImage from '../../../../assets/timer/normal_timer_neutral.png';
-import timeBasedTimerImage from '../../../../assets/timer/time_based_timer.png';
+import normalTimerProsImage from '../../../../assets/timer/normal_timer_pros.jpg';
+import normalTimerConsImage from '../../../../assets/timer/normal_timer_cons.jpg';
+import normalTimerNeutralImage from '../../../../assets/timer/normal_timer_neutral.jpg';
+import timeBasedTimerImage from '../../../../assets/timer/time_based_timer.jpg';
+import timeBasedTimerOnlyTotalImage from '../../../../assets/timer/time_based_timer_only_total.jpg';
import DTClose from '../../../../components/icons/Close';
import TimerCreationContentItem from './TimerCreationContentMenuItem';
import LabeledRadioButton from '../../../../components/LabeledRadioButton/LabeledRadioButton';
@@ -173,6 +174,15 @@ export default function TimerCreationContent({
beforeData?.speaker ?? initData?.speaker ?? '',
);
+ // 시간 총량제 타이머 샘플 이미지 및 대체 텍스트 결정
+ const isSpeakingTimerDisabled = speakerMinutes === 0 && speakerSeconds === 0;
+ const timeBasedPreviewSrc = isSpeakingTimerDisabled
+ ? timeBasedTimerOnlyTotalImage
+ : timeBasedTimerImage;
+ const timeBasedPreviewAlt = isSpeakingTimerDisabled
+ ? 'time-based-timer-only-total-timer'
+ : 'time-based-timer';
+
// 종소리 input 상태
const [bellInput, setBellInput] = useState(initBellInput);
@@ -466,8 +476,8 @@ export default function TimerCreationContent({
/>
) : (
)}
diff --git a/src/page/TimerPage/TimerPage.tsx b/src/page/TimerPage/TimerPage.tsx
index 3d131cd3..025b944e 100644
--- a/src/page/TimerPage/TimerPage.tsx
+++ b/src/page/TimerPage/TimerPage.tsx
@@ -86,7 +86,7 @@ export default function TimerPage() {
{!isLoading && (
@@ -99,6 +99,7 @@ export default function TimerPage() {
index={index}
goToOtherItem={goToOtherItem}
openDoneModal={openLoginAndStoreModalOrGoToOverviewPage}
+ className="absolute bottom-[66px] left-1/2 -translate-x-1/2"
/>
)}
diff --git a/src/page/TimerPage/components/NormalTimer.tsx b/src/page/TimerPage/components/NormalTimer.tsx
index 56919c1d..a067c3c5 100644
--- a/src/page/TimerPage/components/NormalTimer.tsx
+++ b/src/page/TimerPage/components/NormalTimer.tsx
@@ -108,7 +108,7 @@ export default function NormalTimer({
},
)}
>
- 작전 시간
+ 작전 시간 사용
)}
diff --git a/src/page/TimerPage/components/RoundControlRow.tsx b/src/page/TimerPage/components/RoundControlRow.tsx
index 0c1c4760..73438679 100644
--- a/src/page/TimerPage/components/RoundControlRow.tsx
+++ b/src/page/TimerPage/components/RoundControlRow.tsx
@@ -1,3 +1,4 @@
+import clsx from 'clsx';
import RoundControlButton from '../../../components/RoundControlButton/RoundControlButton';
import { TimeBoxInfo } from '../../../type/type';
@@ -6,12 +7,13 @@ interface RoundControlRowProps {
index: number;
goToOtherItem: (isPrev: boolean) => void;
openDoneModal: () => void;
+ className?: string;
}
export default function RoundControlRow(props: RoundControlRowProps) {
- const { table, index, goToOtherItem, openDoneModal } = props;
+ const { table, index, goToOtherItem, openDoneModal, className = '' } = props;
return (
-
+
{index !== 0 && (
goToOtherItem(true)} />