Skip to content

[Fix] Cracking part of css #155

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
Feb 6, 2021
Merged

[Fix] Cracking part of css #155

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
34 changes: 25 additions & 9 deletions src/components/auth/AuthForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,37 @@ import React from 'react';

import { Link } from 'react-router-dom';

import facepaint from 'facepaint';
import styled from '@emotion/styled';

import { NOT_MEMBER_YET, REGISTER, FORM_TYPE } from '../../util/constants/constants';

import Responsive from '../../styles/Responsive';
import palette from '../../styles/palette';
import Button from '../../styles/Button';

const AuthFormWrapper = styled(Responsive)`
const mq = facepaint([
'@media(min-width: 1024px)',
]);

const AuthFormWrapper = styled.div`
${mq({
width: ['calc(100% - 10rem)', '600px'],
height: ['calc(100% - 1rem)', '400px'],
})};
display: flex;
align-items: center;
justify-items: center;
flex-direction: column;
width: 400px;
height: 400px;
margin: 0 auto;
padding: 3rem;
border-radius: 1rem;
box-shadow: rgba(0, 0, 0, 0.04) 0px 4px 16px 0px;
background: ${palette.gray[1]};

h2 {
font-size: 2rem;
${mq({
fontSize: ['3.5vw', '2rem'],
})};
font-weight: bold;
margin-top: 0;
color: black;
Expand All @@ -45,14 +54,16 @@ const ErrorWrapper = styled.div`
`;

const InputWrapper = styled.input`
${mq({
height: ['calc(100% - 1rem)', '40px'],
width: ['45vw', '400px'],
padding: ['1vw 12px', '8px 12px'],
})};
font-size: 1rem;
line-height: 24px;
height: 40px;
width: 400px;
border: 0;
box-shadow: none;
border: 2px solid #D7E2EB;
padding: 8px 12px;
border-radius: 0.25rem;
color: #5f5f5f;
background: white;
Expand All @@ -66,6 +77,9 @@ const InputWrapper = styled.input`
`;

const Footer = styled.div`
${mq({
fontSize: ['2vw', '1rem'],
})};
display: flex;
justify-content: flex-end;
margin-top: 1.5rem;
Expand All @@ -92,7 +106,9 @@ const SpaceBlock = styled.div`
`;

const StyledButton = styled(Button)`
height: 40px;
${mq({
height: ['100%', '40px'],
})};
border: 2px solid ${palette.teal[5]};
&:hover{
border: 2px solid ${palette.teal[5]};
Expand Down
8 changes: 6 additions & 2 deletions src/components/introduce/IntroduceForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ const IntroduceReferenceWrapper = styled.div`
`;

const ModeratorWrapper = styled.div`
font-size: 1.2rem;
${mq({
fontSize: ['2vw', '1rem', '1.2rem'],
})};
font-weight: bold;
display: flex;
justify-content: space-between;
Expand All @@ -55,7 +57,9 @@ const ModeratorWrapper = styled.div`
}

time {
font-size: 1rem;
${mq({
fontSize: ['2vw', '1rem'],
})};
font-weight: normal;
color: ${palette.gray[6]};
}
Expand Down
10 changes: 9 additions & 1 deletion src/components/introduce/IntroduceHeader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
import React from 'react';

import facepaint from 'facepaint';
import styled from '@emotion/styled';

import palette from '../../styles/palette';

const mq = facepaint([
'@media(min-width: 1024px)',
]);

const IntroduceHeaderWrapper = styled.div`
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 2rem;
padding-bottom: 1.5rem;
border-bottom: 2px solid ${palette.gray[4]};

h1 {
font-size: 2.3rem;
${mq({
fontSize: ['5vw', '2.3rem'],
})};
Comment on lines 20 to +23
Copy link
Collaborator Author

@saseungmin saseungmin Feb 6, 2021

Choose a reason for hiding this comment

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

styled component안에 facepaint를 적용시킬려고 했는데 저렇게 띄여쓰기가 eslint error가 발생.

indentation of 4 spaces but found 6.

margin: 0;
line-height: 1.5;
}
Expand Down
12 changes: 11 additions & 1 deletion src/components/introduce/StudyReviewForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import styled from '@emotion/styled';

import StarRatings from 'react-star-ratings';

import facepaint from 'facepaint';

import { STUDY_REVIEW_FORM } from '../../util/constants/constants';
import { changeDateToTime, isCheckedTimeStatus } from '../../util/utils';

Expand All @@ -13,11 +15,15 @@ import Button from '../../styles/Button';

const { FORM_TITLE, REVIEW_SUBMIT } = STUDY_REVIEW_FORM;

const mq = facepaint([
'@media(min-width: 1024px)',
]);

const StudyReviewFormWrapper = styled.div`
display: flex;
flex-direction: column;
margin: 3rem 0 3rem 0;
padding: 20px 0 20px 0;
padding: 20px 20px 20px 20px;
border: 1px solid ${palette.gray[3]};
border-radius: 5px;
background-color: #f8f8f8;
Expand All @@ -29,7 +35,11 @@ const StudyReviewFormHeader = styled.div`
flex-direction: column;
margin: 0 0 0.5rem 0;


h2 {
${mq({
fontSize: ['3vw', '1.5rem'],
})};
margin: 0 0 0.3rem 0;
}
`;
Expand Down
2 changes: 1 addition & 1 deletion src/components/main/StudyGroup.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const StudyGroupWrapper = styled.div(() => mq({
margin: ['1rem 0px 1rem 0px', '0.5rem', '1rem'],
borderRadius: '4px',
border: `2px solid ${palette.gray[4]}`,
width: ['100%', 'calc(50% - 2rem)', '19rem'],
width: ['100%', 'calc(50% - 1.5rem)', '19rem'],
boxShadow: 'rgba(0, 0, 0, 0.08) 0px 4px 16px 0px',
background: 'rgb(248, 249, 250)',
}));
Expand Down
4 changes: 4 additions & 0 deletions src/styles/DateTimeStatus.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ const DateTimeStatusWrapper = styled.div`

${({ status }) => status === 'mainRecruit'
&& css`
${mq({
fontSize: ['0.8rem', '1rem'],
height: ['15px', '20px'],
})};
margin-bottom: 0.5rem;
background: ${palette.cyan[4]};
animation: blink-animation 1.5s steps(5, start) infinite;
Expand Down
2 changes: 1 addition & 1 deletion src/styles/Responsive.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const ResponsiveContainer = styled.div(() => mq({
marginRight: 'auto',
paddingLeft: '1rem',
paddingRight: '1rem',
width: ['calc(100% - 2rem)', '680px', '1024px'],
width: ['calc(100% - 3rem)', '680px', '1024px'],
}));

const Responsive = ({ children, ...rest }) => (
Expand Down
17 changes: 14 additions & 3 deletions src/styles/StyledApplyStatusButton.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
/* eslint-disable react/jsx-props-no-spreading */
import React from 'react';

import facepaint from 'facepaint';
import styled from '@emotion/styled';

import palette from './palette';

const mq = facepaint([
'@media(min-width: 1024px)',
]);

const StyledApplyStatusButtonWrapper = styled.button`
${mq({
fontSize: ['2.7vw', '1.5rem'],
padding: ['0.25rem 10vw', '0.25rem 5rem'],
})};
height: 33px;
font-family: 'Gamja Flower', cursive;
font-size: 1.5em;
display: inline-flex;
align-items: center;
margin: .5rem 0 .5rem 0;
padding: 0.25rem 5rem;
border: none;
border-radius: 0.4rem;
outline: none;
Expand Down Expand Up @@ -56,8 +64,11 @@ const StyledApplyStatusButtonWrapper = styled.button`
}

&.confirm {
${mq({
fontSize: ['2.7vw', '1.5rem'],
padding: ['0.25rem 5vw', '0.25rem 2.5rem'],
})};
cursor: pointer;
padding: 0.25rem 2.5rem;
color: white;
background: #4dabf7;

Expand Down