Merge pull request #14 from 001elijah/header

fix
001elijah · Jun 20, 2023 · d28ce3d · d28ce3d
2 parents f647c18 + 7f8dc69
commit d28ce3d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/assets/icons/sprite.svg b/src/assets/icons/sprite.svg
diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx
@@ -8,7 +8,7 @@ import s from './Header.module.scss';
 import icons from '../../assets/icons/sprite.svg';
 
 export const Header = () => {
-  const theme = useSelector(state => state.auth?.user?.theme) || 'colorful';
+  const theme = useSelector(state => state.auth?.user?.theme);
 
   return (
     <header className={clsx(s.header, s[theme])}>

diff --git a/src/components/SharedLayout/SharedLayout.jsx b/src/components/SharedLayout/SharedLayout.jsx
@@ -1,6 +1,6 @@
 import { useSelector } from 'react-redux';
 
-import { Header } from 'components/Header/Header';
+// import { Header } from 'components/Header/Header';
 import { Loader } from 'components/Loader/Loader';
 
 export const SharedLayout = () => {
@@ -12,7 +12,7 @@ export const SharedLayout = () => {
       {isLoading && <Loader />}
 
       {/* {token && <Header />} */}
-      <Header/>
+      {/* <Header/> */}
     </>
   );
 };
diff --git a/src/components/UserInfo/UserInfo.module.scss b/src/components/UserInfo/UserInfo.module.scss
@@ -10,7 +10,7 @@
     font-size: 14px;
     line-height: 1.5px;
     letter-spacing: -0.02em;
-    color: $white-text-color;
+    color: $black-text-color;
 
     &.light {
       color: $black-text-color;