diff --git a/frontend/src/components/Icons/HomeIcon.tsx b/frontend/src/components/Icons/HomeIcon.tsx index 9db8c1016..a87badcb1 100644 --- a/frontend/src/components/Icons/HomeIcon.tsx +++ b/frontend/src/components/Icons/HomeIcon.tsx @@ -11,14 +11,14 @@ export default function HomeIcon(props: HomeIconProps) { return ( + + + + + ); +} diff --git a/frontend/src/components/Icons/ScissorsIcon.tsx b/frontend/src/components/Icons/ScissorsIcon.tsx deleted file mode 100644 index 9ad2dcf38..000000000 --- a/frontend/src/components/Icons/ScissorsIcon.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import { useTheme } from '@emotion/react'; - -interface ScissorsIconProps { - isActive: boolean; -} - -export default function ScissorsIcon(props: ScissorsIconProps) { - const { isActive } = props; - - const theme = useTheme(); - - return ( - - - - ); -} diff --git a/frontend/src/components/NavigationBar/NavigationBarItem/NavigationBarItem.tsx b/frontend/src/components/NavigationBar/NavigationBarItem/NavigationBarItem.tsx index d02f0429a..f2ffc307f 100644 --- a/frontend/src/components/NavigationBar/NavigationBarItem/NavigationBarItem.tsx +++ b/frontend/src/components/NavigationBar/NavigationBarItem/NavigationBarItem.tsx @@ -6,7 +6,7 @@ import MyPageIcon from '@_components/Icons/MyPageIcon'; import { Tab } from '@_components/NavigationBar/NavigationBar'; import { common } from '@_common/common.style'; import { useTheme } from '@emotion/react'; -import ScissorsIcon from '@_components/Icons/ScissorsIcon'; +import RouletteItemIcon from '@_components/Icons/RouletteItemIcon'; interface NavigationBarItemProps { tab: Tab; @@ -25,7 +25,7 @@ export default function NavigationBarItem(props: NavigationBarItemProps) { ) : tab === '채팅' ? ( ) : tab === '룰렛' ? ( - + ) : ( ); diff --git a/frontend/src/pages/Bet/BetListPage/components/BetCardList/BetCard/BetCard.style.ts b/frontend/src/pages/Bet/BetListPage/components/BetCardList/BetCard/BetCard.style.ts index 08ff65319..551bfa6bc 100644 --- a/frontend/src/pages/Bet/BetListPage/components/BetCardList/BetCard/BetCard.style.ts +++ b/frontend/src/pages/Bet/BetListPage/components/BetCardList/BetCard/BetCard.style.ts @@ -18,23 +18,17 @@ export const leftSection = css` align-items: flex-start; `; -export const title = ({ theme }: { theme: Theme }) => css` - font-size: 1.4rem; - font-weight: bold; - color: ${theme.colorPalette.grey[400]}; -`; - export const deadline = ({ theme, isAnnounced, leftMinute, }: { theme: Theme; + isAnnounced: boolean; leftMinute: number; }) => css` - font-size: ${theme.typography.b2}; - font-size: 2.2rem; + font-size: 1.4rem; font-weight: bold; color: ${isAnnounced || leftMinute < 0 ? theme.colorPalette.grey[400] @@ -49,6 +43,21 @@ export const deadline = ({ : theme.colorPalette.black[100]}; `; +export const title = ({ + theme, + isAnnounced, +}: { + theme: Theme; + isAnnounced: boolean; +}) => css` + font-size: ${theme.typography.b2}; + font-size: 2.2rem; + font-weight: bold; + color: ${isAnnounced + ? theme.colorPalette.grey[400] + : theme.colorPalette.black[100]}; +`; + export const participantCount = ({ theme }: { theme: Theme }) => css` display: flex; align-items: center; diff --git a/frontend/src/pages/Bet/BetListPage/components/BetCardList/BetCard/BetCard.tsx b/frontend/src/pages/Bet/BetListPage/components/BetCardList/BetCard/BetCard.tsx index 6e260542b..1fa0833ef 100644 --- a/frontend/src/pages/Bet/BetListPage/components/BetCardList/BetCard/BetCard.tsx +++ b/frontend/src/pages/Bet/BetListPage/components/BetCardList/BetCard/BetCard.tsx @@ -23,7 +23,6 @@ export default function BetCard(props: BetCardProps) { return (
onClick(bet.id)}>
-
{bet.title}
+
+ {bet.title} +
{bet.currentParticipants}명
- 지금 당첨 확률 {probabilityPercentage}% + 지금 오면 당첨 확률 {probabilityPercentage}%
diff --git a/frontend/src/pages/Moim/MoimDetailPage/components/ProfileList/ProfileCard/ProfileCard.style.ts b/frontend/src/pages/Moim/MoimDetailPage/components/ProfileList/ProfileCard/ProfileCard.style.ts index 92c9ce193..3127fead8 100644 --- a/frontend/src/pages/Moim/MoimDetailPage/components/ProfileList/ProfileCard/ProfileCard.style.ts +++ b/frontend/src/pages/Moim/MoimDetailPage/components/ProfileList/ProfileCard/ProfileCard.style.ts @@ -1,6 +1,8 @@ import { css, Theme } from '@emotion/react'; export const profileCard = css` + z-index: -1; + display: flex; flex-direction: column; gap: 0.4rem;