Skip to content

Commit

Permalink
v2.2.1 QA 반영 (#75)
Browse files Browse the repository at this point in the history
* mobile 버전 navigation list font family 수정

* Member page blur 10px 로 조정

* font-family 재수정

* header button text 가 가운데 정렬되도록 수정

* 운영진 resource 수정 및 Person 컴포넌트 click event 추가

* Noto Sans 폰트 추가

* 폰트 재수정

* 아이콘 사이즈 조정

* misc
  • Loading branch information
pumpkiinbell authored Jun 25, 2022
1 parent efbdec9 commit b8bd90c
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 55 deletions.
1 change: 1 addition & 0 deletions common/components/Header/NavigationItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ const itemMobileStyles = css`
font-size: 40px;
font-weight: bold;
font-family: Gmarket Sans;
line-height: 40px;
:hover {
Expand Down
10 changes: 8 additions & 2 deletions common/components/Header/NavigationItemList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,15 @@ const NotifyContainer = styled.div`
`;

const GoogleFormRedirectButton = styled.div<{ device: Device }>`
width: auto;
width: 145px;
height: 38px;
display: flex;
justify-content: center;
align-items: center;
font-family: Noto Sans, Gmarket Sans, ---apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
padding: 12px 24px;
margin-left: 7px;
border-radius: 27px;
Expand Down
16 changes: 8 additions & 8 deletions modules/member/assets/behance.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions modules/member/assets/github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions modules/member/assets/homepage.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions modules/member/assets/linkedin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions modules/member/components/Person.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default function Person({ name, depromeetPosition, jobPosition, photoLink
const [hover, setHover] = useState(false);

return (
<Container onMouseEnter={() => setHover(true)} onMouseLeave={() => setHover(false)}>
<Container onClick={() => setHover(true)} onMouseEnter={() => setHover(true)} onMouseLeave={() => setHover(false)}>
<ImageWrapper device={device}>
<Image src={photoLink} layout="fill" objectFit="cover" css={{ borderRadius: '10px 10px 0 0' }} />
</ImageWrapper>
Expand Down Expand Up @@ -111,7 +111,7 @@ const Backdrop = styled.div<{ device: Device }>`
column-gap: 14px;
background: rgba(0, 0, 0, 0.7);
backdrop-filter: blur(20px);
backdrop-filter: blur(10px);
svg {
cursor: pointer;
Expand Down
46 changes: 24 additions & 22 deletions modules/member/utils/semester/11.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,18 @@ const 이송민: Person = {
link: {
linkedIn: 'https://www.linkedin.com/in/imean1030/',
behance: 'https://www.behance.net/songminlee',
homepage: 'https://imean.tistory.com/m',
},
};

const 박준영: Person = {
name: '박준영',
jobPosition: 'UX Designer',
photoLink: '/member/11/박준영.jpeg',
const 정미숙: Person = {
name: '정미숙',
jobPosition: 'Product designer',
photoLink: '/member/11/정미숙.jpg',
link: {
linkedIn: 'https://www.linkedin.com/in/jun-young-park',
behance: 'https://www.behance.net/senki1009',
linkedIn: 'https://www.linkedin.com/in/misuk-jeong-2bba94224/',
behance: 'https://www.behance.net/misukj12240ed5',
homepage: 'https://kusim.tistory.com/',
},
};

Expand All @@ -44,14 +46,23 @@ const 박종호: Person = {
},
};

const 정미숙: Person = {
name: '정미숙',
const 이병호: Person = {
name: '이병호',
jobPosition: 'Product designer',
photoLink: '/member/11/정미숙.jpg',
photoLink: '/member/11/이병호.jpg',
link: {
linkedIn: 'https://www.linkedin.com/in/misuk-jeong-2bba94224/',
behance: 'https://www.behance.net/misukj12240ed5',
homepage: 'https://kusim.tistory.com/',
behance: 'https://www.behance.net/lee1796ca3a',
linkedIn: 'https://www.linkedin.com/in/%EB%B3%91%ED%98%B8-%EC%9D%B4-312466235/',
},
};

const 박준영: Person = {
name: '박준영',
jobPosition: 'UX Designer',
photoLink: '/member/11/박준영.jpeg',
link: {
linkedIn: 'https://www.linkedin.com/in/jun-young-park',
behance: 'https://www.behance.net/senki1009',
},
};

Expand All @@ -75,13 +86,4 @@ const 김효진: Person = {
},
};

const 이병호: Person = {
name: '이병호',
jobPosition: 'Product designer',
photoLink: '/member/11/이병호.jpg',
link: {
behance: 'https://www.behance.net/lee1796ca3a',
},
};

export default [김성민, 이송민, 박준영, 박종호, 정미숙, 신동빈, 김효진, 이병호];
export default [김성민, 이송민, 정미숙, 박종호, 이병호, 박준영, 신동빈, 김효진];
6 changes: 6 additions & 0 deletions pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ export default function App({ Component, pageProps }: AppProps) {
src: url('/fonts/GmarketSansTTFBold.ttf') format('truetype');
}
@font-face {
font-family: 'Noto Sans';
font-weight: 400;
src: url('/fonts/NotoSansKR-Medium.otf') format('truetype');
}
:focus {
outline: none;
border: none;
Expand Down
Binary file added public/fonts/NotoSansKR-Medium.otf
Binary file not shown.

1 comment on commit b8bd90c

@vercel
Copy link

@vercel vercel bot commented on b8bd90c Jun 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.