Skip to content

Commit

Permalink
📱 Change px to rem
Browse files Browse the repository at this point in the history 
#306 rem 단위로 통일
  • Loading branch information
@chaeyoungwon
chaeyoungwon committed Nov 7, 2024
1 parent 963a3ee commit ba330cf
Show file tree
Hide file tree
Showing 10 changed files with 115 additions and 112 deletions.
12 changes: 6 additions & 6 deletions gongjakso/src/components/Footer/Footer.Styled.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ export const Footer = styled.div`
display: flex;
margin: auto;
width: 100%;
max-width: 75rem;
height: 92px;
max-width: 77.85rem;
height: 5.75rem;
align-items: center;
justify-content: center;
border-top: 1.5px solid black;
border-top: 0.094rem solid black;
background: inherit; // Ensures the Footer has the same background as MainContent
position: absolute;
bottom: 0;
Expand All @@ -31,7 +31,7 @@ export const FooterInfoBox = styled.div`
`;

export const FooterInfo = styled.div`
font-size: 10px;
font-size: 0.625rem;
margin: auto;
`;

Expand All @@ -44,10 +44,10 @@ export const FooterButtonBox = styled.div`
`;

export const FooterButton = styled.button`
font-size: 15px;
font-size: 0.938rem;
font-weight: bold;
display: flex;
cursor: pointer;
border: none;
margin: 10px;
margin: 0.625rem;
`;
44 changes: 22 additions & 22 deletions gongjakso/src/components/Header/Bubble.Styled.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ export const BubbleContainer = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
top: 55px;
width: 370px;
right: -50px;
top: 3.438rem;
width: 27rem;
right: -3.8rem;
display: flex;
border-radius: 20px;
border: 2px solid #eee;
border-radius: 1.25rem;
border: 0.125rem solid #eee;
background-color: white;
position: absolute;
z-index: 100;
Expand All @@ -27,28 +27,28 @@ export const BubbleContainer = styled.div`
content: '';
position: absolute;
border: none;
width: 20px;
height: 20px;
width: 1.25rem;
height: 1.25rem;
background-color: white;
border-left: 2px solid #eee;
border-top: 2px solid #eee;
top: -12px;
border-left: 0.125rem #eee;
border-top: 0.125rem solid #eee;
top: -0.75rem;
right: 17%;
transform: rotate(45deg);
}
`;
export const SubTitle = styled.span`
font-size: ${({ theme }) => theme.fontSize.base};
font-family: 'PreMedium';
margin: 10px;
margin: 0.625rem;
display: flex;
cursor: pointer;
justify-content: space-between;
align-items: center;
`;

export const ArrowImage = styled(Arrow)`
width: 15px;
width: 0.938rem;
display: flex;
align-items: center;
cursor: pointer;
Expand All @@ -66,7 +66,7 @@ export const MypageImg = styled(Mypage)`
display: flex;
align-items: center;
justify-content: center;
width: 100px;
width: 6.25rem;
height: auto;
cursor: pointer;
`;
Expand All @@ -82,22 +82,22 @@ export const InfoBox = styled.div`
export const NameTitle = styled.p`
font-size: ${({ theme }) => theme.fontSize.mdd};
font-family: 'PreMedium';
margin: 2px 0px;
margin: 0.125rem 0;
`;

//학과
export const MajorTitle = styled.p`
font-family: 'PreRegular';
font-size: ${({ theme }) => theme.fontSize.base};
margin: 2px 0px;
margin: 0.125rem 0;
`;

//프로필 이미지
export const ProfileImage = styled(defaultProfile)`
width: 60px;
width: 3.75rem;
display: flex;
justify-content: center;
padding: 5px;
padding: 0.313rem;
`;

export const ProfileDetail = styled.div`
Expand All @@ -110,27 +110,27 @@ export const InfoDetail = styled.div`
flex-direction: column;
align-items: baseline;
justify-content: center;
margin: 0 10px;
margin: 0 0.625rem;
`;

export const BlueLine = styled.div`
display: flex;
width: 100%;
border-top: 0.7px solid #c2d6ff;
border-top: 0.044rem solid #c2d6ff;
`;

export const GreyLine = styled.div`
display: flex;
width: 100%;
border-top: 0.7px solid #dcdcdc;
border-top: 0.044rem solid #dcdcdc;
`;

export const LoginButton = styled.button`
display: flex;
cursor: pointer;
justify-content: baseline;
font-family: 'PreRegular';
padding: 5px;
margin: 10px 10px 10px 30px;
padding: 0.313rem;
margin: 0.625rem 0.625rem 0.625rem 1.875rem;
text-decoration: underline;
`;
8 changes: 4 additions & 4 deletions gongjakso/src/components/Header/Buttons.styled.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ export const IconButton = styled.button`
display: flex;
flex-direction: column;
align-items: center;
width: 150px;
gap: 5px;
width: 9.375rem;
gap: 0.313rem;
color: ${({ theme, $active, $type }) => {
if ($active) {
if ($type === 'project') {
Expand All @@ -27,7 +27,7 @@ export const IconNameSpan = styled.span`
$active ? theme.main : $hover ? theme.main : theme.mainFont};
`;
export const ProfileIcon = styled.img`
width: 30px;
width: 1.875rem;
height: auto;
margin: 0 10px;
margin: 0 0.625rem;
`;
8 changes: 4 additions & 4 deletions gongjakso/src/components/Header/Header.Styled.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const Header = styled.div`
display: flex;
width: 100%;
justify-content: center;
padding: 15px;
padding: 0.938rem;
align-items: center;
position: absolute;
top: 0;
Expand All @@ -15,7 +15,7 @@ export const HeaderBase = styled.div`
width: 100%;
justify-content: space-around;
align-items: center;
height: 40px;
height: 2.5rem;
`;
export const ItemList = styled.ul`
display: flex;
Expand All @@ -27,13 +27,13 @@ export const logo = styled.div`
display: flex;
justify-content: center;
align-items: center;
margin: 0 30px;
margin: 0 1.875rem;
`;

export const ProfileArea = styled.div`
display: flex;
flex-direction: row;
margin-left: 350px;
margin-left: 21.875rem;
align-items: center;
width: 0;
font-weight: 700;
Expand Down
24 changes: 13 additions & 11 deletions gongjakso/src/components/common/Calendar/SelectOne.Styled.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export const Container = styled.div`
position: relative;
display: flex;
flex-direction: column;
gap: 10px;
gap: 0.625rem;
`;

export const DateContent = styled.div`
Expand All @@ -14,20 +14,20 @@ export const DateContent = styled.div`
width: ${({ width }) => width};
height: 3.438rem;
background-color: white;
border: 1.5px solid var(--system-grey4, #d2d2d7);
border: 0.094rem solid var(--system-grey4, #d2d2d7);
border-radius: 0.688rem;
font-family: 'PreRegular';
font-size: ${({ theme }) => theme.fontSize.m};
color: ${({ theme }) => theme.subFont};
padding: 0 15px;
padding: 0 0.938rem;
font-weight: 500;
`;

export const DateSelect = styled.div`
display: flex;
align-items: center;
border: 1.5px solid var(--system-grey4, #d2d2d7);
padding: 15px 0;
border: 0.094rem solid var(--system-grey4, #d2d2d7);
padding: 0.938rem 0;
border-radius: 0.688rem;
flex-direction: column;
background-color: white;
Expand All @@ -38,23 +38,25 @@ export const ButtonContent = styled.div`
flex-direction: row;
justify-content: center;
align-items: center;
gap: 30px;
gap: 1.875rem;
`;

export const Button = styled.button`
display: flex;
justify-content: center;
align-items: center;
width: 70px;
height: 30px;
border-radius: 15px;
width: 4.375rem;
height: 1.875rem;
border-radius: 0.938rem;
color: ${props => (props.$isDelete ? 'black' : 'white')};
background-color: ${props =>
props.$isDelete ? props.theme.subFont2 : props.theme.mainFont};
`;

export const CalendarEmoji = styled.div`
background: url(${emoji});
width: 18px;
height: 16.88px;
width: 1.125rem;
height: 1.055rem;
background-repeat: no-repeat;
background-size: contain;
`;
37 changes: 19 additions & 18 deletions gongjakso/src/components/common/Input/Input.Styled.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const SelectContainer = styled.div`

export const SelectValue = styled.div`
display: block;
width: ${props => (props.$case === 'true' ? '155px' : '400px')};
width: ${props => (props.$case === 'true' ? '11rem' : '25rem')};
display: flex;
flex-direction: row;
justify-content: space-between;
Expand All @@ -25,27 +25,28 @@ export const SelectValue = styled.div`
export const OptionList = styled.div`
position: absolute;
font-family: 'PreMedium';
right: -10px;
width: ${props => (props.$case === 'true' ? '185px' : '430px')};
right: -1.15rem;
width: ${props => (props.$case === 'true' ? '13.6rem' : '26.875rem')};
font-size: ${({ theme }) => theme.fontSize.m};
margin: ${props => (props.$case === 'true' ? '20px 0px' : '20px 0px')};
margin: ${props =>
props.$case === 'true' ? '1.25rem 0rem' : '1.25rem 0rem'};
list-style: none;
border-radius: 4px;
border-radius: 0.25rem;
background-color: #fff;
z-index: 1;
border: 1px solid hsl(0, 0%, 90%);
max-height: 300px;
border: 0.063rem solid hsl(0, 0%, 90%);
max-height: 18.75rem;
overflow-y: ${props => (props.$scroll === 'true' ? 'scroll' : 'hidden')};
box-shadow: 0 4px 17px rgba(0, 0, 0, 0.05);
box-shadow: 0 0.25rem 1.063rem rgba(0, 0, 0, 0.05);
.option {
font-family: PreRegular;
padding: 15px;
font-family: 'PreRegular';
padding: 0.938rem;
cursor: pointer;
border-radius: 4px;
border-radius: 0.25rem;
transition: background-color 0.1s ease;
font-weight: 600;
font-size: 1.125rem;
padding-left: 20px;
padding-left: 1.25rem;
&:hover {
background-color: black;
Expand All @@ -69,18 +70,18 @@ export const InputText = styled.input.attrs(props => ({
}))`
font-size: ${({ theme }) => theme.fontSize.base};
padding: 10px 0;
padding: 0.625rem 0;
border-style: none;
border-bottom: 1px solid ${({ theme }) => theme.border};
border-bottom: 0.063rem solid ${({ theme }) => theme.border};
&:focus {
outline: none;
border-bottom: 1px solid ${({ theme }) => theme.mainFont};
border-bottom: 0.063rem solid ${({ theme }) => theme.mainFont};
}
&.warning {
gap: 10px;
border-bottom: 1px solid ${({ theme }) => theme.repo.open};
gap: 0.625rem;
border-bottom: 0.063rem solid ${({ theme }) => theme.repo.open};
}
/* Hide the spinners in Chrome, Safari, Edge, Opera */
&::-webkit-outer-spin-button,
Expand All @@ -96,7 +97,7 @@ export const InputText = styled.input.attrs(props => ({
export const Arrow = styled.img`
display: flex;
align-items: center;
padding-right: 5px;
justify-content: center;
`;

Expand Down
Loading

0 comments on commit ba330cf

Please sign in to comment.