diff --git a/src/components/common/Carousel/style.ts b/src/components/common/Carousel/style.ts index ee94c092..367a8ebe 100644 --- a/src/components/common/Carousel/style.ts +++ b/src/components/common/Carousel/style.ts @@ -19,7 +19,7 @@ const Arrow = styled.div<{ type: CarouselArrowType }>` background-color: ${colors.gray600}; color: white; z-index: 2; - top: 50%; + top: calc(50% - 16px); transform: translateY(-50%); cursor: pointer; background-repeat: no-repeat; diff --git a/src/components/common/Select/index.tsx b/src/components/common/Select/index.tsx index 1e207cc5..1d263f2f 100644 --- a/src/components/common/Select/index.tsx +++ b/src/components/common/Select/index.tsx @@ -41,7 +41,7 @@ export default function Select({ onClick={toggleSelect} isSelectionExist={selectedValue !== baseValue} isOpened={isOpen} - selectedValue={selectedValue} + isWide={labels[selectedValue].length >= 5} > {selectedValue === baseValue ? baseLabel : labels[selectedValue]} diff --git a/src/components/common/Select/style.ts b/src/components/common/Select/style.ts index 09578a7f..6cae9dc3 100644 --- a/src/components/common/Select/style.ts +++ b/src/components/common/Select/style.ts @@ -1,7 +1,6 @@ import styled from '@emotion/styled'; import { colors } from '@sopt-makers/colors'; import arrowDown from '@src/assets/icons/arrow_down.svg'; -import { LabelKeyType } from '@src/lib/types/universal'; const SelectWrapper = styled.div` position: relative; @@ -10,11 +9,11 @@ const SelectWrapper = styled.div` const SelectTrigger = styled.button<{ isSelectionExist: boolean; isOpened: boolean; - selectedValue: LabelKeyType; + isWide: boolean; }>` cursor: pointer; position: relative; - width: ${({ selectedValue }) => (selectedValue === 'ANDROID' ? '132px' : '110px')}; + width: ${({ isWide }) => (isWide ? '132px' : '110px')}; font-size: 16px; font-weight: 500; padding: 9px ${({ isSelectionExist }) => (isSelectionExist ? '16px' : '22px')}; @@ -40,7 +39,7 @@ const SelectTrigger = styled.button<{ } @media (max-width: 899px) { padding: 8px 12px; - border-radius: 16px; + border-radius: 99px; font-size: 13px; line-height: 150%; letter-spacing: -0.13px; diff --git a/src/views/ProjectPage/ProjectPage.tsx b/src/views/ProjectPage/ProjectPage.tsx index 4df249be..907c41fc 100644 --- a/src/views/ProjectPage/ProjectPage.tsx +++ b/src/views/ProjectPage/ProjectPage.tsx @@ -2,6 +2,7 @@ import { css } from '@emotion/react'; import { useState } from 'react'; import PageLayout from '@src/components/common/PageLayout'; import Select from '@src/components/common/Select'; +import { useIsMobile } from '@src/hooks/useDevice'; import { activeProjectCategoryList, activeProjectPlatformList, @@ -19,6 +20,7 @@ function Projects() { const [selectedPlatform, setPlatform] = useState(ProjectPlatformType.ALL); const state = useFetch(selectedCategory, selectedPlatform); + const isMobile = useIsMobile('899px'); return ( - SOPT에서 진행된 프로젝트 둘러보기 + SOPT{!isMobile && '에서 진행된'} 프로젝트 둘러보기