Skip to content

Migrate absolute units to relative ones #38

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

Open
nicocadq wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Migrate absolute units to relative ones #38

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
1 change: 1 addition & 0 deletions .eslintcache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"/Users/nicolas/Desktop/loopcommerce/src/components/Signup/Signup.styles.js":"1","/Users/nicolas/Desktop/loopcommerce/src/components/Login/Login.styles.js":"2","/Users/nicolas/Desktop/loopcommerce/src/components/Header/Header.styles.js":"3","/Users/nicolas/Desktop/loopcommerce/src/components/ServiceCard/ServiceCard.styles.js":"4"},{"size":1204,"mtime":1606834976334,"results":"5","hashOfConfig":"6"},{"size":1219,"mtime":1606834957022,"results":"7","hashOfConfig":"6"},{"size":1976,"mtime":1606835127674,"results":"8","hashOfConfig":"6"},{"size":950,"mtime":1606835297105,"results":"9","hashOfConfig":"6"},{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"tmtx83",{"filePath":"12","messages":"13","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/nicolas/Desktop/loopcommerce/src/components/Signup/Signup.styles.js",[],"/Users/nicolas/Desktop/loopcommerce/src/components/Login/Login.styles.js",[],"/Users/nicolas/Desktop/loopcommerce/src/components/Header/Header.styles.js",[],"/Users/nicolas/Desktop/loopcommerce/src/components/ServiceCard/ServiceCard.styles.js",[]]
Copy link
Collaborator

@eleleiva eleleiva Dec 1, 2020

Choose a reason for hiding this comment

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

You might want to add this file to the .gitignore

14 changes: 13 additions & 1 deletion src/App.styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ export const globalStyles = ({ theme }) => css`
padding: 0;
}

html {
font-size: 62.5%;
}

body {
background-color: ${theme.colors.scaleGray1};
margin: 0 auto;
Expand All @@ -21,7 +25,8 @@ export const globalStyles = ({ theme }) => css`
margin: 0 auto;
display: flex;
flex-direction: column;
a footer,

footer,
header {
flex-shrink: 0;
}
Expand All @@ -30,4 +35,11 @@ export const globalStyles = ({ theme }) => css`
flex-grow: 1;
}
}

@media screen and (min-width: ${({ theme: { breakpoints } }) =>
breakpoints.md}) {
html {
font-size: 100%;
}
}
`;
2 changes: 1 addition & 1 deletion src/components/Banner/Banner.styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from "@emotion/styled";

export const Container = styled.div`
height: 240px;
height: 24rem;
margin: 0 auto;
max-width: 90%;
`;
Expand Down
14 changes: 8 additions & 6 deletions src/components/Cart/Cart.styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,27 @@ export const StyledTable = styled.table`
`;

export const TableCell = styled.td`
border-bottom: 1px solid ${({ theme: { colors } }) => colors.scaleGray3};
height: 30px;
padding: 15px;
border-bottom: 0.1rem solid ${({ theme: { colors } }) => colors.scaleGray3};
font-size: 1.2rem;
height: 3rem;
padding: 1.5rem;
text-align: center;
`;

export const TableHead = styled(TableCell.withComponent("th"))`
font-size: 1.5rem;
text-transform: uppercase;
`;

export const TotalPrice = styled.span`
align-self: flex-end;
color: ${({ theme: { colors } }) => colors.scaleGray4};
font-size: 20px;
padding: 30px;
font-size: 2rem;
padding: 3rem;
`;

export const Checkout = styled.div`
margin: 30px;
margin: 3rem;
position: absolute;
bottom: 0;
`;
4 changes: 2 additions & 2 deletions src/components/ErrorBoundary/ErrorBoundary.styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ export const Message = styled.p`
background-color: ${({ theme: { colors } }) => colors.scaleRed};
border-radius: ${({ theme: { border } }) => border.radius.xs};
color: ${({ theme: { colors } }) => colors.lightRed};
padding: 30px;
padding: 3rem;
`;

export const Error = styled.p`
padding: 30px;
padding: 3rem;
width: 80%;
`;
14 changes: 7 additions & 7 deletions src/components/Footer/Footer.styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ export const Container = styled.footer`
flex-direction: column;
align-items: center;
flex-wrap: wrap;
font-size: 15px;
padding-top: 30px;
min-height: 300px;
font-size: 1.5rem;
padding-top: 2em;
min-height: 20em;
`;

export const ColumnsContainer = styled.div`
Expand All @@ -32,18 +32,18 @@ export const LinksContainer = styled.div`
`;

export const Link = styled.div`
margin-top: 10px;
margin-top: 1rem;
`;

export const Information = styled.div`
display: flex;
flex-wrap: wrap;
justify-content: space-around;
min-height: 30px;
padding: 30px;
min-height: 3rem;
padding: 3rem;
width: 90%;
`;

export const Text = styled.p`
margin: 10px;
margin: 1rem;
`;
30 changes: 15 additions & 15 deletions src/components/Form/Form.styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const StyledButton = styled.button`
border: none;
border-radius: ${({ theme: { border } }) => border.radius.xs};
font-family: ${({ theme: { fontFamily } }) => fontFamily.inter};
padding: 10px;
padding: 1rem;

&:disabled {
opacity: 0.5;
Expand All @@ -19,30 +19,30 @@ const StyledButton = styled.button`

export const PrimaryButton = styled(StyledButton)`
background-color: ${({ theme: { colors } }) => colors.scaleSkyBlue1};
border: 1px solid ${({ theme: { colors } }) => colors.scaleSkyBlue1};
border: 0.1rem solid ${({ theme: { colors } }) => colors.scaleSkyBlue1};
color: ${({ theme: { colors } }) => colors.scaleWhite};
`;

export const SecondaryButton = styled(StyledButton)`
border: 1px solid ${({ theme: { colors } }) => colors.scaleSkyBlue1};
border: 0.1rem solid ${({ theme: { colors } }) => colors.scaleSkyBlue1};
color: ${({ theme: { colors } }) => colors.scaleSkyBlue1};
`;

export const SecondaryBlackButton = styled(StyledButton)`
border: 1px solid ${({ theme: { colors } }) => colors.lightBlack};
border: 0.1rem solid ${({ theme: { colors } }) => colors.lightBlack};
color: ${({ theme: { colors } }) => colors.lightBlack};
`;

export const StyledInput = styled.input`
background-color: ${({ hasError, theme: { colors } }) =>
hasError ? colors.lightRed : colors.transparentGray};
border: 1px solid
border: 0.1rem solid
${({ hasError, theme: { colors } }) =>
hasError ? colors.scaleRed : colors.scaleGray2};
border-radius: ${({ theme: { border } }) => border.radius.xs};
height: 40px;
padding: 10px 16px;
width: 270px;
height: 4rem;
padding: 1em 1.6em;
width: 27rem;

&::placeholder {
color: ${({ hasError, theme: { colors } }) =>
Expand All @@ -52,8 +52,8 @@ export const StyledInput = styled.input`

export const InputError = styled.p`
color: ${({ theme: { colors } }) => colors.scaleRed};
font-size: 12px;
margin-top: 5px;
font-size: 1.2rem;
margin-top: 0.5rem;
`;

export const Label = styled.label`
Expand All @@ -63,9 +63,9 @@ export const Label = styled.label`

export const RequiredText = styled.span`
color: ${({ theme: { colors } }) => colors.scaleGray4};
font-size: 14px;
font-size: 1.4rem;
font-style: italic;
margin-left: 5px;
margin-left: 0.5rem;
`;

export const StyledSelect = styled.select`
Expand All @@ -74,15 +74,15 @@ export const StyledSelect = styled.select`
background: url("../../assets/images/arrow-select.svg")
${({ hasError, theme: { colors } }) =>
hasError ? colors.lightRed : colors.transparentGray}
no-repeat calc(100% - 10px) !important;
no-repeat calc(100% - 1rem) !important;

border: 1px solid
${({ hasError, theme: { colors } }) =>
hasError ? colors.scaleRed : colors.scaleGray2};
border-radius: ${({ theme: { border } }) => border.radius.xs};
color: ${({ hasError, theme: { colors } }) =>
hasError ? colors.scaleRed : colors.transparentBlue};
height: 40px;
padding: 10px 16px;
height: 4rem;
padding: 1em 1.6em;
width: 100%;
`;
27 changes: 14 additions & 13 deletions src/components/Header/Header.styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { Button } from "../Form";
export const Container = styled.header`
background-color: ${({ theme: { colors } }) => colors.scaleWhite};
display: flex;
padding: 5px;
height: 86px;
padding: 0.5rem;
height: 8.6rem;
width: 100%;
`;

Expand All @@ -27,38 +27,39 @@ export const ButtonsGroup = styled.div`

& > button,
& > div {
margin-right: 10px;
margin-right: 1rem;
}
`;

export const UserContainer = styled.div`
color: ${({ theme: { colors } }) => colors.scaleGreyishBrown0};
font-size: 1.6rem;
position: relative;
`;

export const StyledFontAwesomeIcon = styled(FontAwesomeIcon)`
margin-right: 8px;
margin-right: 0.8rem;
`;

export const OptionsDrop = styled.div`
background-color: ${({ theme: { colors } }) => colors.scaleWhite};
border-radius: ${({ theme: { border } }) => border.radius.xs};
box-shadow: 0 0 6px 0 ${({ theme: { colors } }) => colors.transparentBlack};
box-shadow: 0 0 0.6rem 0 ${({ theme: { colors } }) => colors.transparentBlack};
position: absolute;
top: 30px;
right: 5px;
width: 150px;
top: 3rem;
right: 0.5rem;
width: 15rem;
z-index: 2;

&:after {
border-style: solid;
border-width: 0 10px 10px 10px;
border-width: 0 1rem 1rem 1rem;
border-color: transparent transparent
${({ theme: { colors } }) => colors.scaleWhite} transparent;
content: "";
height: 0;
position: absolute;
right: 10px;
right: 1rem;
top: -25%;
width: 0;
z-index: 2;
Expand All @@ -74,15 +75,15 @@ export const StyledButton = styled(Button)`
text-align: right;

&:nth-child(odd) {
border-bottom: 1px solid ${({ theme: { colors } }) => colors.scaleGray3};
border-bottom: 0.1rem solid ${({ theme: { colors } }) => colors.scaleGray3};
border-radius: 0;
}
`;

export const CartContainer = styled.div`
display: flex;
justify-content: space-between;
font-size: 14px;
font-size: 1.4rem;
font-weight: 600;
width: 25px;
width: 2.5rem;
`;
26 changes: 13 additions & 13 deletions src/components/Home/Home.styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const Container = styled.main`
`;

export const BannerContainer = styled.div`
margin: 20px 0px;
margin: 2rem 0rem;
width: 100%;
`;

Expand All @@ -27,10 +27,10 @@ export const ServiceContainer = styled.div`

export const NewArrivalsTitle = styled.h2`
color: ${({ theme: { colors } }) => colors.scaleBlack};
font-size: 28px;
font-size: 2.8rem;
font-weight: 200;
letter-spacing: 0.2px;
padding: 5px;
letter-spacing: 0.02em;
padding: 0.5rem;
margin-left: 5.5%;
`;

Expand All @@ -40,15 +40,15 @@ export const Products = styled.div`
justify-content: center;

& > div {
margin: 10px;
margin: 1rem;
}
`;

export const PaginationContainer = styled.div`
align-self: center;
display: flex;
justify-content: center;
margin: 40px;
margin: 4rem;
max-width: ${({ theme: { breakpoints } }) => breakpoints.xl};
width: 90%;

Expand All @@ -60,19 +60,19 @@ export const PaginationContainer = styled.div`
}

& > div > button {
border-radius: 0px;
border-right: 0px;
padding: 5px 8px;
border-radius: 0rem;
border-right: 0rem;
padding: 0.5rem 0.8rem;
}

& > div > button:first-child {
border-radius: ${({ theme: { border } }) => border.radius.xs} 0px 0px
border-radius: ${({ theme: { border } }) => border.radius.xs} 0rem 0rem
${({ theme: { border } }) => border.radius.xs};
}

& > div > button:last-child {
border-right: 1px solid;
border-radius: 0px ${({ theme: { border } }) => border.radius.xs}
${({ theme: { border } }) => border.radius.xs} 0px;
border-right: 0.1rem solid;
border-radius: 0rem ${({ theme: { border } }) => border.radius.xs}
${({ theme: { border } }) => border.radius.xs} 0rem;
}
`;
8 changes: 4 additions & 4 deletions src/components/Loader/Loader.styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ export const Wrapper = styled.div`
`;

export const StyledLoader = styled.div`
border: 16px solid ${({ theme: { colors } }) => colors.scaleGray1};
border-top: 16px solid ${({ theme: { colors } }) => colors.scaleSkyBlue1};
border: 1.6rem solid ${({ theme: { colors } }) => colors.scaleGray1};
border-top: 1.6rem solid ${({ theme: { colors } }) => colors.scaleSkyBlue1};
border-radius: 50%;
width: 120px;
height: 120px;
width: 12rem;
height: 12rem;
animation: spin 1s linear infinite;

@keyframes spin {
Expand Down
Loading