diff --git a/src/components/exam/Carousel/index.css b/src/components/exam/Carousel/index.css index 7e90a3c..8e33608 100644 --- a/src/components/exam/Carousel/index.css +++ b/src/components/exam/Carousel/index.css @@ -146,6 +146,7 @@ .melc-c-i-i-exam-sit{ position: absolute; + z-index: 20; top: 20px; left: 10px; padding: 5px 5px; diff --git a/src/components/header/Header.js b/src/components/header/Header.js index e805d34..6215ddd 100644 --- a/src/components/header/Header.js +++ b/src/components/header/Header.js @@ -12,6 +12,7 @@ import { Link } from 'react-router-dom'; import arrowIcon from './MobileSideMenu/arrow-down.svg' import exitIcon from '../../assets/img/group-9.svg' import backIcon from './arrow-left-1.svg'; +import profileIcon from './MobileSideMenu/profile-active.svg' const Header = ({ isMobile, cart, logOut @@ -36,12 +37,18 @@ const Header = ({ subMenu &&
+
+ + کوروش زراندوز ( معلم شیمی ) +
setSubMenu(false)} className='w-full text-right border-b border-gray-200 py-2'> ورود به پنل ادمین - setSubMenu(false)} className='w-full text-right border-b border-gray-200 py-2'> + {/* setSubMenu(false)} className='w-full text-right border-b border-gray-200 py-2'> ورود به صفحه افزودن آزمون - + */} + + setSubMenu(false)} className='w-full text-right border-b border-gray-200 py-2'> افزودن حساب کاربری جدید @@ -61,22 +68,22 @@ const Header = ({ { location.pathname.includes('messages') ? ( -
navigate(-1)} className="w-8 h-8 bg-red-100 rounded-md flex items-center justify-center"> - +
navigate(-1)} className="w-8 h-8 bg-red-100 rounded-md flex items-center justify-center"> +
- ): ( + ) : ( -
-
{cart?.length}
- - - - - - - -
- +
+
{cart?.length}
+ + + + + + + +
+ ) }
: @@ -84,7 +91,7 @@ const Header = ({ {location.pathname.includes('adminpanel') ?
: <>
- setSubMenu(!subMenu)} /> + setSubMenu(!subMenu)} />
avatar1
diff --git a/src/components/header/Header.scss b/src/components/header/Header.scss index 0e1f694..a7dcaa5 100644 --- a/src/components/header/Header.scss +++ b/src/components/header/Header.scss @@ -26,11 +26,12 @@ $RegularFont:"IRANSansX-Regular"; @keyframes fadeInAnimation { 0% { - height: 0px; + // height: 0px; + opacity: 0; } 100% { - height: 200px; - + height: fit-content; + opacity: 1; } } \ No newline at end of file