diff --git a/src/components/Footer/Footer.module.scss b/src/components/Footer/Footer.module.scss index 878481e..fa8f733 100644 --- a/src/components/Footer/Footer.module.scss +++ b/src/components/Footer/Footer.module.scss @@ -2,13 +2,14 @@ footer { bottom: 0; - position: relative; width: 100%; - height: 100%; display: flex; justify-content: center; flex-direction: column; background: $black; + height: auto; + position: sticky; + top: 100% } //Footer Bottom @@ -512,11 +513,12 @@ footer { list-style: none; padding-left: 0; margin-top: 10px; - row-gap: 6px; + row-gap: 12px; display: flex; flex-direction: column; @media (max-width: 1025px) { margin-top: 0; + } @media (min-width: 2500px) { margin-top: 23.24px; @@ -625,7 +627,7 @@ footer { margin: 0; padding: 0; @media (min-width: 2500px) { - height: 141.24px; + height: 139.26px; } @media (max-width: 1025px) { height: 180.01px; diff --git a/src/components/Header/Header.module.scss b/src/components/Header/Header.module.scss index 6c31d1c..bba3e26 100644 --- a/src/components/Header/Header.module.scss +++ b/src/components/Header/Header.module.scss @@ -7,6 +7,8 @@ header { width: 100%; height: 120px; background: $black; + position: absolute; + @media (min-width: 2500px) { height: 162px; } @@ -279,7 +281,7 @@ header { transform: translateX(-100%); transition: 0.5s ease-in-out; background: rgba(69, 69, 69, 0.7); - position: absolute; + position: fixed; top: 0; border-top-width: 0px; z-index: 2; @@ -369,7 +371,7 @@ header { } .Header__Bottom.opened { @media (max-width: 1025px) { - position: absolute; + position: fixed; z-index: 2; width: 100%; height: 100%; diff --git a/src/components/Main/Main.module.scss b/src/components/Main/Main.module.scss index 0bee6e2..041092c 100644 --- a/src/components/Main/Main.module.scss +++ b/src/components/Main/Main.module.scss @@ -3,32 +3,35 @@ //Main main { width: 100%; - min-height: calc(100vh - 588px); display: flex; - justify-content: center; flex-direction: column; align-items: center; margin-bottom: 66.56px; + margin-top: 120px; + position: relative; @media (min-width: 2500px) { - min-height: calc(100vh - 765px); margin-bottom: 66.56px; + margin-top: 162px; } @media (max-width: 1025px) { margin-bottom: 80px; + margin-top: 139px; } .Navigation__Bar { width: 84.378%; - position: absolute; - top: 149px; + position: relative; + top: 29px; + bottom: 0; + margin-bottom: 108px; display: flex; align-items: center; @media (min-width: 2500px) { - top: 191px; + margin-bottom: 136.75px; width: 92.002%; } @media (max-width: 1025px) { width: 96.875%; - top: 168px; + margin-bottom: 108px; } @media (max-width: 376px) { width: 91.484%; @@ -74,13 +77,13 @@ main { letter-spacing: 0.1em; text-transform: uppercase; color: #292929; - margin: 141px 0 80px; + margin: 0 0 80px; @media (min-width: 2500px) { font-size: 48px; line-height: 56px; } @media (max-width: 1025px) { - margin: 125px 0 40px; + margin: 0 0 40px; } } .Container { diff --git a/src/global.scss b/src/global.scss index a1bce60..9cd9ac0 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1,17 +1,19 @@ @import "variaveis.scss"; -*{ +* { font-family: "Roboto"; font-style: normal; } body { - box-sizing: border-box; - margin: 0; - padding: 0; - background: $white; + box-sizing: border-box; + margin: 0; + padding: 0; + background: $white; } -html,body { - height: 100%; +#root { + display: flex; + height: 100vh; + flex-direction: column; }