Skip to content

Commit

Permalink
Merge pull request #64 from MargoMarm/fix/HomeSignInSignUpPadding
Browse files Browse the repository at this point in the history
fix
  • Loading branch information
MargoMarm authored Sep 21, 2023
2 parents 69c8703 + 5b178c8 commit 56118c7
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/components/CustomNavLink/CustomNavLink.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import { Link } from './CustomNavLink.styled';

import PropTypes from 'prop-types';

const CustomNavLink = ({ to, isrange, isinheader, text }) => {
const CustomNavLink = ({ to, isorange, isinheader, text }) => {
return (
<Link isrange={isrange} isinheader={isinheader} to={to}>
<Link isorange={isorange} isinheader={isinheader} to={to}>
{text}
</Link>
);
};

CustomNavLink.propTypes = {
to: PropTypes.string,
isrange: PropTypes.string,
isorange: PropTypes.string,
isinheader: PropTypes.string,
text: PropTypes.string,
};
Expand Down
4 changes: 3 additions & 1 deletion src/components/MainTitle/MainTitle.styled.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ export const Text = styled.h1`
${mq.mobile} {
width: 335px;
margin-top: 66px;
margin-bottom: 40px;
line-height: 105.26%;
}
Expand All @@ -44,7 +46,7 @@ export const Text = styled.h1`
line-height: 111.43%;
letter-spacing: 0.7px;
padding-top: 116px;
margin-top: 116px;
margin-bottom: 64px;
}
`;
4 changes: 3 additions & 1 deletion src/components/headersComp/Header/Header.styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ export const HeaderContainer = styled.div`
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 20px;
${mq.tablet} {
background-color: ${colors.black};
padding: 0 32x;
height: 84px;
border-bottom: 1px solid ${colors.textWhite03};
Expand All @@ -19,5 +20,6 @@ export const HeaderContainer = styled.div`
${mq.desktop} {
background-color: transparent;
border: none;
padding-left: 96px;
}
`;
3 changes: 3 additions & 0 deletions src/pages/Home/Home.styled.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const Wrapper = styled.div`
background-repeat: no-repeat;
background-position: right;
background-size: 298px 571px;
padding: 0 20px;
@media (min-device-pixel-ratio: 2),
(-webkit-min-device-pixel-ratio: 2),
Expand All @@ -37,6 +38,7 @@ export const Wrapper = styled.div`
height: 768px;
background-image: url(${imgForHome.imgTx1});
background-size: 437px 893px;
padding: 0 32px;
@media (min-device-pixel-ratio: 2),
(-webkit-min-device-pixel-ratio: 2),
Expand All @@ -58,6 +60,7 @@ export const Wrapper = styled.div`
${mq.desktop} {
height: 0;
background: none;
padding: 0 0 0 96px;
}
`;

Expand Down

0 comments on commit 56118c7

Please sign in to comment.