luizfelipe9627/desafio-react-e-typescript-luiz-felipe
1
0
Fork 0
forked from M3-Academy/desafio-react-e-typescript
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'release/footer' (#16) from release/footer into development

Browse Source 
Reviewed-on: #16
This commit is contained in:
Luiz Felipe Silva 2023-01-19 02:45:37 +00:00
commit 407f5bcd4c
6 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Header/Nav.module.scss
View File

@ -2,7 +2,7 @@
.nav {
padding: 14px 100px;
background-color: $black;
background-color: $black-100;
text-decoration: none;
@media (max-width: 1024px) {

2
src/components/footer/FooterBottom.module.scss
View File

@ -2,7 +2,7 @@
.footerBottom {
padding: 15px 100px;
background-color: $black;
background-color: $black-100;
color: $white;
display: flex;
align-items: center;

52
src/components/footer/FooterTop.module.scss
View File

@ -24,28 +24,40 @@
@media (max-width: 1024px) {
text-transform: capitalize;
position: relative;
&::after {
content: "+";
position: absolute;
right: 0;
}
}
}
li {
list-style: none;
margin-bottom: 12px;
a {
font-size: 12px;
font-weight: 400;
line-height: 14px;
text-decoration: none;
color: $primary-100;
@media (min-width: 2500px) {
font-size: 24px;
line-height: 28px;
}
ul {
@media (max-width: 1024px) {
display: none;
}
&:last-child {
text-decoration: underline;
li {
list-style: none;
margin-bottom: 12px;
a {
font-size: 12px;
font-weight: 400;
line-height: 14px;
text-decoration: none;
color: $primary-100;
@media (min-width: 2500px) {
font-size: 24px;
line-height: 28px;
}
}
&:last-child {
text-decoration: underline;
}
}
}
@ -59,6 +71,10 @@
line-height: 28px;
}
@media (max-width: 1024px) {
display: none;
}
&:nth-child(2),
&:nth-child(4) {
font-weight: 500;
@ -92,7 +108,7 @@
}
}
}
img {
@media (min-width: 2500px) {
width: 70px;

4
src/components/footer/Newsletter.module.scss
View File

@ -2,7 +2,7 @@
.newsletter {
margin-top: 70px;
border: 1px solid $black;
border: 1px solid $black-100;
border-left: none;
border-right: none;
display: flex;
@ -72,7 +72,7 @@
height: 42px;
width: 126px;
border-radius: 4px;
background: $black;
background: $black-100;
color: $white;
font-size: 12px;
font-weight: 700;

4
src/pages/Home.tsx
View File

@ -7,12 +7,12 @@ import { Footer } from "./Footer";
function Home() {
return (
<body>
<React.Fragment>
<Header />
<Section />
<Footer />
<ButtonsGlobal />
</body>
</React.Fragment>
);
}

6
src/styles/utils/variables.scss
View File

@ -1,7 +1,9 @@
$black: #000000;
$black-100: #000000;
$black-300: #100d0e;
$white: #ffffff;
$primary-900: #ff0000;
$primary-700: #f2f2f2;
$primary-500: #c4c4c4;
$primary-500: #b9b7b7;
$primary-400: #c4c4c4;
$primary-300: #7d7d7d;
$primary-100: #303030;