diff --git a/frontend/src/components/ClubLogo/ClubLogo.tsx b/frontend/src/components/ClubLogo/ClubLogo.tsx index f9c2cfeeb..3a3898df5 100644 --- a/frontend/src/components/ClubLogo/ClubLogo.tsx +++ b/frontend/src/components/ClubLogo/ClubLogo.tsx @@ -9,8 +9,8 @@ interface ClubLogoProps { const presets = { main: { - desktop: { width: '66px', height: '66px', radius: '6px' }, - mobile: { width: '50px', height: '50px', radius: '6px' }, + desktop: { width: '66px', height: '66px', radius: '14px' }, + mobile: { width: '50px', height: '50px', radius: '10px' }, }, detail: { desktop: { width: '80px', height: '80px', radius: '10px' }, diff --git a/frontend/src/components/ClubStateBox/ClubStateBox.tsx b/frontend/src/components/ClubStateBox/ClubStateBox.tsx index 7640c9147..c73c35f6b 100644 --- a/frontend/src/components/ClubStateBox/ClubStateBox.tsx +++ b/frontend/src/components/ClubStateBox/ClubStateBox.tsx @@ -47,6 +47,15 @@ const BOX_DIMENSIONS = { }, } as const; +const BOX_FONT_SIZE = { + desktop: { + fontSize: '0.875rem', + }, + mobile: { + fontSize: '0.75rem', + }, +} as const; + const StyledBox = styled.div<{ $bgColor: string; $textColor: string }>` display: flex; justify-content: center; @@ -57,12 +66,13 @@ const StyledBox = styled.div<{ $bgColor: string; $textColor: string }>` border-radius: 8px; background-color: ${({ $bgColor }) => $bgColor}; color: ${({ $textColor }) => $textColor}; - font-size: 0.75rem; + font-size: ${BOX_FONT_SIZE.desktop.fontSize}; font-weight: 500; @media (max-width: 500px) { width: ${BOX_DIMENSIONS.mobile.width}; height: ${BOX_DIMENSIONS.mobile.height}; + font-size: ${BOX_FONT_SIZE.mobile.fontSize}; } `; diff --git a/frontend/src/components/ClubTag/ClubTag.tsx b/frontend/src/components/ClubTag/ClubTag.tsx index 358dcf07b..1db966bb7 100644 --- a/frontend/src/components/ClubTag/ClubTag.tsx +++ b/frontend/src/components/ClubTag/ClubTag.tsx @@ -23,22 +23,34 @@ const TAG_STYLES = { borderRadius: '8px', }, mobile: { - padding: '4px 6px', + padding: '4px 8px', borderRadius: '6px', }, } as const; +const TAG_FONT_SIZE = { + desktop: { + fontSize: '0.875rem', + }, + mobile: { + fontSize: '0.75rem', + }, +} as const; + const StyledTag = styled.span<{ color: string }>` - display: inline-block; + display: flex; + align-items: center; padding: ${TAG_STYLES.desktop.padding}; + height: 28px; border-radius: ${TAG_STYLES.desktop.borderRadius}; background-color: ${({ color }) => color}; - font-size: 0.875rem; + font-size: ${TAG_FONT_SIZE.desktop.fontSize}; font-weight: 600; color: #3a3a3a; @media (max-width: 500px) { height: 25px; + font-size: ${TAG_FONT_SIZE.mobile.fontSize}; padding: ${TAG_STYLES.mobile.padding}; border-radius: ${TAG_STYLES.mobile.borderRadius}; } diff --git a/frontend/src/pages/MainPage/MainPage.styles.ts b/frontend/src/pages/MainPage/MainPage.styles.ts index 0a6065b78..b8a1a9c1f 100644 --- a/frontend/src/pages/MainPage/MainPage.styles.ts +++ b/frontend/src/pages/MainPage/MainPage.styles.ts @@ -25,9 +25,9 @@ export const ContentWrapper = styled.div` export const SectionBar = styled.div` display: flex; - align-items: center; + align-items: flex-end; justify-content: space-between; - margin: 60px 8px 24px; + margin: 60px 0px 24px 8px; ${media.mobile} { margin: 32px 4px 16px; @@ -76,7 +76,6 @@ export const TotalCountResult = styled.span` font-size: 18px; font-weight: bold; color: #787878; - padding-top: 13px; ${media.mobile} { font-size: 12px; @@ -88,7 +87,6 @@ export const CardList = styled.div` width: 100%; max-width: 100%; gap: 20px; - margin-top: 50px; transition: gap 0.5s ease, grid-template-columns 0.5s ease; diff --git a/frontend/src/pages/MainPage/components/ClubCard/ClubCard.styles.ts b/frontend/src/pages/MainPage/components/ClubCard/ClubCard.styles.ts index e73686fa4..0ee2f9e6c 100644 --- a/frontend/src/pages/MainPage/components/ClubCard/ClubCard.styles.ts +++ b/frontend/src/pages/MainPage/components/ClubCard/ClubCard.styles.ts @@ -1,9 +1,16 @@ import styled from 'styled-components'; const CARD_STYLES = { - borderRadius: '20px', - padding: '20px', - gap: '16px', + desktop: { + borderRadius: '20px', + padding: '20px', + gap: '16px', + }, + mobile: { + borderRadius: '16px', + padding: '16px', + gap: '8px', + }, } as const; const CardContainer = styled.div<{ @@ -13,9 +20,9 @@ const CardContainer = styled.div<{ width: 100%; display: flex; flex-direction: column; - border-radius: ${CARD_STYLES.borderRadius}; - padding: ${CARD_STYLES.padding}; - gap: ${CARD_STYLES.gap}; + border-radius: ${CARD_STYLES.desktop.borderRadius}; + padding: ${CARD_STYLES.desktop.padding}; + gap: ${CARD_STYLES.desktop.gap}; background-color: #fff; box-shadow: ${({ $state }) => @@ -28,10 +35,20 @@ const CardContainer = styled.div<{ box-shadow 0.2s ease-in-out; transform: ${({ $isClicked }) => ($isClicked ? 'scale(1.05)' : 'scale(1)')}; cursor: pointer; + touch-action: manipulation; + + @media (max-width: 500px) { + border-radius: ${CARD_STYLES.mobile.borderRadius}; + padding: ${CARD_STYLES.mobile.padding}; + gap: ${CARD_STYLES.mobile.gap}; + box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.10); + } - &:hover { - transform: ${({ $isClicked }) => - $isClicked ? 'scale(1.05)' : 'scale(1.03)'}; + @media (hover: hover) { + &:hover { + transform: ${({ $isClicked }) => + $isClicked ? 'scale(1.05)' : 'scale(1.03)'}; + } } &:active { @@ -60,9 +77,13 @@ const ClubInfo = styled.div` align-items: flex-start; `; -const ClubName = styled.h2` - font-size: 1.25rem; +const ClubName = styled.p` + font-size: 1.375rem; font-weight: bold; + + @media (max-width: 500px) { + font-size: 1rem; + } `; export const StateBoxTagContainer = styled.div` @@ -93,6 +114,7 @@ const INTRODUCTION_MARGIN = { const Introduction = styled.p` font-size: 0.875rem; + font-weight: normal; margin: ${INTRODUCTION_MARGIN.desktop.margin}; color: rgba(129, 129, 129, 1); line-height: 16px; @@ -100,6 +122,7 @@ const Introduction = styled.p` @media (max-width: 500px) { margin: ${INTRODUCTION_MARGIN.mobile.margin}; + font-size: 0.75rem; } `;