From 65e52200fc7298f127efbe9974ef460e5881b11a Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 20 Jan 2023 17:38:37 -0300 Subject: [PATCH] =?UTF-8?q?feat:=20adiciona=20menu=20hamburguer=20e=20esti?= =?UTF-8?q?liza=C3=A7=C3=A3o=20do=204k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/images/closeicon.svg | 4 + .../src/assets/images/menuhambicon.svg | 5 + .../src/assets/images/searchicon4k.svg | 3 + .../src/components/Header/Header.module.scss | 65 ++++++++ .../src/components/Header/Header.tsx | 3 + .../MenuHamburguer/MenuHamb.module.scss | 147 ++++++++++++++++++ .../components/MenuHamburguer/MenuHamb.tsx | 93 +++++++++++ 7 files changed, 320 insertions(+) create mode 100644 desafio-react-e-typescript/src/assets/images/closeicon.svg create mode 100644 desafio-react-e-typescript/src/assets/images/menuhambicon.svg create mode 100644 desafio-react-e-typescript/src/assets/images/searchicon4k.svg create mode 100644 desafio-react-e-typescript/src/components/MenuHamburguer/MenuHamb.module.scss create mode 100644 desafio-react-e-typescript/src/components/MenuHamburguer/MenuHamb.tsx diff --git a/desafio-react-e-typescript/src/assets/images/closeicon.svg b/desafio-react-e-typescript/src/assets/images/closeicon.svg new file mode 100644 index 0000000..e0e6d36 --- /dev/null +++ b/desafio-react-e-typescript/src/assets/images/closeicon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/desafio-react-e-typescript/src/assets/images/menuhambicon.svg b/desafio-react-e-typescript/src/assets/images/menuhambicon.svg new file mode 100644 index 0000000..6cadeb3 --- /dev/null +++ b/desafio-react-e-typescript/src/assets/images/menuhambicon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/desafio-react-e-typescript/src/assets/images/searchicon4k.svg b/desafio-react-e-typescript/src/assets/images/searchicon4k.svg new file mode 100644 index 0000000..9d31f23 --- /dev/null +++ b/desafio-react-e-typescript/src/assets/images/searchicon4k.svg @@ -0,0 +1,3 @@ + + + diff --git a/desafio-react-e-typescript/src/components/Header/Header.module.scss b/desafio-react-e-typescript/src/components/Header/Header.module.scss index 68a79fd..ec90265 100644 --- a/desafio-react-e-typescript/src/components/Header/Header.module.scss +++ b/desafio-react-e-typescript/src/components/Header/Header.module.scss @@ -7,6 +7,16 @@ height: 76px; padding: 24px 100px; + @media screen and (min-width: 2500px) { + width: 100%; + max-width: unset; + height: 101px; + } + + @media screen and (max-width: 1024px) { + display: none; + } + .container-logo { button { background: transparent; @@ -16,6 +26,12 @@ max-width: 136px; height: 26px; cursor: pointer; + + @media screen and (min-width: 2500px) { + width: 100%; + max-width: unset; + height: unset; + } } } } @@ -26,6 +42,11 @@ display: flex; position: relative; + @media screen and (min-width: 2500px) { + width: 100%; + max-width: 515px; + } + input { width: 100%; height: 32px; @@ -33,8 +54,18 @@ border-radius: 5px; padding: 8px 10px 8px 16px; + @media screen and (min-width: 2500px) { + padding-top: 20px; + height: 58px; + } + &::placeholder { color: #c6c6c6; + + @media screen and (min-width: 2500px) { + font-size: 28px; + line-height: 33px; + } } } @@ -49,6 +80,13 @@ background-repeat: no-repeat; margin: 8px 10px 8px 16px; cursor: pointer; + + @media screen and (min-width: 2500px) { + width: 35px; + height: 35px; + margin: 11px 16px 11px 16px; + background-image: url(../../assets/images/searchicon4k.svg); + } } } @@ -69,6 +107,11 @@ text-decoration: none; color: #fff; margin-right: 55px; + + @media screen and (min-width: 2500px) { + font-size: 28px; + line-height: 33px; + } } .carticon { @@ -76,6 +119,12 @@ max-width: 28px; height: 28px; cursor: pointer; + + @media screen and (min-width: 2500px) { + width: 100%; + max-width: 54px; + height: 54px; + } } } @@ -87,6 +136,16 @@ width: 100%; height: 44px; + @media screen and (min-width: 2500px) { + width: 100%; + max-width: unset; + height: 61px; + } + + @media screen and (max-width: 1024px) { + display: none; + } + .container-bottom-menu { width: 100%; margin-left: 100px; @@ -100,6 +159,12 @@ line-height: 16px; text-transform: uppercase; margin-right: 55px; + + @media screen and (min-width: 2500px) { + font-weight: 500; + font-size: 28px; + line-height: 33px; + } } } } diff --git a/desafio-react-e-typescript/src/components/Header/Header.tsx b/desafio-react-e-typescript/src/components/Header/Header.tsx index 59ae9fc..0044323 100644 --- a/desafio-react-e-typescript/src/components/Header/Header.tsx +++ b/desafio-react-e-typescript/src/components/Header/Header.tsx @@ -2,11 +2,14 @@ import React from "react"; import logo from "../../assets/images/Logo-M3Academy 1.svg"; import cart from "../../assets/images/carticon.svg"; +import { MenuHamb } from "../MenuHamburguer/MenuHamb"; + import styles from "./Header.module.scss"; const Header = () => { return (