Skip to content

[Improve] settings title and study list change font #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saseungmin merged 1 commit into from
Dec 13, 2020
Merged

[Improve] settings title and study list change font #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 🌈 project-react-2-saseungmin (이름 미정)

# 🌈 ConStu
- Connect to Study (스터디를 잇다)
### 🚀 Hosting URL
https://sweet-1cfff.web.app/

Expand Down
10 changes: 5 additions & 5 deletions src/components/common/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import Button from '../../styles/Button';
const HeaderWrapper = styled.div`
position: fixed;
width: 100%;
background: white;
box-shadow: 0px 2px 4px ${palette.teal[2]};
background: ${palette.gray[1]};
box-shadow: 0px 2px 4px ${palette.gray[4]};
z-index: 100;
`;

Expand All @@ -30,8 +30,8 @@ const UserStatusWrapper = styled.div`
`;

const TitleWrapper = styled(Link)`
font-weight: bold;
font-size: 1.8rem;
font-family: 'Jua', sans-serif;
font-size: 2.3rem;
`;

const Spacer = styled.div`
Expand All @@ -42,7 +42,7 @@ const Header = ({ user, onLogout }) => (
<>
<HeaderWrapper>
<Wrapper>
<TitleWrapper to="/">제목(미정)</TitleWrapper>
<TitleWrapper to="/">ConStu</TitleWrapper>
{user ? (
<UserStatusWrapper>
<span>{user}</span>
Expand Down
7 changes: 3 additions & 4 deletions src/components/main/StudyGroup.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const StudyGroupWrapper = styled.div`

const HeaderLink = styled(Link)`
display: block;
padding: 0.8rem 1rem 0.8rem 1rem;
padding: 1.5rem 1.2rem 0.8rem 1rem;
h4 {
text-align: center;
margin: 0px 0px 0.25rem;
Expand All @@ -35,9 +35,8 @@ const HeaderLink = styled(Link)`
white-space: nowrap;
overflow: hidden;
color: ${palette.gray[8]};
font-size: 2.3rem;
font-weight: 500;
font-family: 'Nanum Pen Script', cursive;
font-size: 1.7rem;
font-family: 'Sunflower', sans-serif;
&:hover {
color: ${palette.gray[6]};
}
Expand Down
4 changes: 2 additions & 2 deletions src/containers/common/HeaderContainer.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('HeaderContainer', () => {
it('renders Header text', () => {
const { container } = renderHeaderContainer();

expect(container).toHaveTextContent('제목(미정)');
expect(container).toHaveTextContent('ConStu');
expect(container).toHaveTextContent('로그아웃');
});

Expand All @@ -57,7 +57,7 @@ describe('HeaderContainer', () => {
it('renders Header text', () => {
const { container } = renderHeaderContainer();

expect(container).toHaveTextContent('제목(미정)');
expect(container).toHaveTextContent('ConStu');
expect(container).toHaveTextContent('로그인');
expect(container).toHaveTextContent('회원가입');
});
Expand Down
3 changes: 3 additions & 0 deletions src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ font-family: 'Nanum Pen Script', cursive;
@import url('//cdn.jsdelivr.net/gh/wan2land/d2coding/d2coding-full.css');
@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@300&display=swap');
/* font-family: 'Noto Sans KR', sans-serif; */
@import url('https://fonts.googleapis.com/css2?family=Jua&family=Sunflower:wght@500&display=swap');
/* font-family: 'Jua', sans-serif; */
/* font-family: 'Sunflower', sans-serif; */

* {
box-sizing: inherit;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/MainPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import StudyGroupsContainer from '../containers/groups/StudyGroupsContainer';
const MainPage = () => (
<>
<Helmet>
<title>제목(미정)</title>
<title>ConStu</title>
</Helmet>
<Responsive>
<StudyGroupsContainer />
Expand Down