Merge pull request #31 from 001elijah/fix

Fix
001elijah · Jun 26, 2023 · 9f5e081 · 9f5e081
2 parents aef85f0 + d6b703f
commit 9f5e081
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 23 deletions.
diff --git a/src/assets/styles/_mixins.scss b/src/assets/styles/_mixins.scss
@@ -1,27 +1,30 @@
 @mixin container {
   width: 100%;
-  padding-left: 16px;
-  padding-right: 16px;
+  // padding-left: 16px;
+  // padding-right: 16px;
   margin: 0 auto;
 
-  @media screen and (min-width: 375px) {
-    width: 375px;
-    padding-left: 20px;
-    padding-right: 20px;
-  }
+//   @media screen and (min-width: 375px) {
+//     width: 100%;
+//     background-color: transparent;
+//     // width: 375px;
+//     // padding-left: 20px;
+//     // padding-right: 20px;
+//   }
 
-  @media screen and (min-width: 768px) {
-    width: 768px;
-    padding-left: 32px;
-    padding-right: 32px;
-  }
+//   @media screen and (min-width: 768px) {
+//     // width: 768px;
+//     // padding-left: 32px;
+//     // padding-right: 32px;
+//   }
 
-  @media screen and (min-width: 1280px) {
-    min-width: 1280px;
-    max-width: 1440px;
-    padding-left: 24px;
-    padding-right: 24px;
-  }
+//   @media screen and (min-width: 1280px) {
+//     // min-width: 1280px;
+//     // max-width: 1440px;
+//     // padding-left: 24px;
+//     // padding-right: 24px;
+//   }
+// }
 }
 
 @mixin visually-hidden {

diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import clsx from 'clsx';
-// import { Container } from 'components/Container';
+//  import { Container } from 'components/Container';
 import { UserInfo } from 'components/UserInfo/UserInfo';
 import { selectorTheme } from 'redux/Auth/authSelectors';
 import { themeChangeUser } from 'redux/Auth/authOperations';

diff --git a/src/components/Header/Header.module.scss b/src/components/Header/Header.module.scss
@@ -19,8 +19,9 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding-top: 14px;
-    padding-bottom: 14px;
+    // padding-top: 14px;
+    // padding-bottom: 14px;
+    padding: 14px 20px;
 
     .burgerMenu {
       width: 24px;
@@ -172,8 +173,9 @@
 @include tablet {
   .header {
     .pageHeader {
-      padding-top: 18px;
-      padding-bottom: 18px;
+      // padding-top: 18px;
+      // padding-bottom: 18px;
+      padding: 18px 32px;
 
       .burgerMenu {
         width: 32px;
@@ -191,6 +193,8 @@
 @include desktop {
   .header {
     .pageHeader {
+      padding: 18px 24px;
+
       .burgerMenu {
         display: none;
       }