diff --git a/src/components/UI/ActionBtn/styles.module.scss b/src/components/UI/ActionBtn/styles.module.scss index 416c224..6d08052 100644 --- a/src/components/UI/ActionBtn/styles.module.scss +++ b/src/components/UI/ActionBtn/styles.module.scss @@ -4,7 +4,7 @@ outline: none; padding: 6px 12px; border-radius: 5px; - background: #273666; + background: var(--action-btn-bg); font-size: 12px; font-weight: 500; line-height: 100%; @@ -16,8 +16,7 @@ } &:hover { - opacity: 0.8; - background: #273666; + background: var(--action-btn-bg); } &.primary { @@ -31,4 +30,4 @@ &.danger { color: #ff6767; } -} +} \ No newline at end of file diff --git a/src/components/UI/HorizontalSelect/HorizontalSelect.module.scss b/src/components/UI/HorizontalSelect/HorizontalSelect.module.scss index 954b222..6de89ee 100644 --- a/src/components/UI/HorizontalSelect/HorizontalSelect.module.scss +++ b/src/components/UI/HorizontalSelect/HorizontalSelect.module.scss @@ -4,10 +4,23 @@ overflow: auto; padding-bottom: 3px; + &.sm { + gap: 5px !important; + + >div { + a { + font-size: 14px !important; + padding: 8px !important; + border-radius: 8px !important; + line-height: 100%; + } + } + } + &.tab { gap: 3px; - > div { + >div { a { font-size: 16px; font-weight: 500; @@ -26,7 +39,7 @@ } } - > div { + >div { position: relative; .profile__filters__notification { @@ -58,4 +71,4 @@ } } } -} +} \ No newline at end of file diff --git a/src/components/UI/HorizontalSelect/HorizontalSelect.tsx b/src/components/UI/HorizontalSelect/HorizontalSelect.tsx index c1d833f..6758c3c 100644 --- a/src/components/UI/HorizontalSelect/HorizontalSelect.tsx +++ b/src/components/UI/HorizontalSelect/HorizontalSelect.tsx @@ -2,6 +2,7 @@ import Link from 'next/link'; import { nanoid } from 'nanoid'; import HorizontalSelectProps from '@/interfaces/props/components/UI/HorizontalSelect/HorizontalSelectProps'; import HorizontalSelectValue from '@/interfaces/common/HorizontalSelectValue'; +import { classes } from '@/utils/utils'; import NotificationIndicator from '../NotificationIndicator/NotificationIndicator'; import styles from './HorizontalSelect.module.scss'; @@ -13,7 +14,12 @@ function HorizontalSelect(props: HorizontalSele return (
{props.body.map((e) => (
diff --git a/src/components/default/BackButton/BackButton.module.scss b/src/components/default/BackButton/BackButton.module.scss index 4c7d844..885af78 100644 --- a/src/components/default/BackButton/BackButton.module.scss +++ b/src/components/default/BackButton/BackButton.module.scss @@ -1,4 +1,11 @@ .back_btn { display: flex; gap: 12px; -} + + &.sm { + + padding: 12px 22px; + font-size: 14px; + font-weight: 500; + } +} \ No newline at end of file diff --git a/src/components/default/BackButton/BackButton.tsx b/src/components/default/BackButton/BackButton.tsx index c3b05d7..a89c8cd 100644 --- a/src/components/default/BackButton/BackButton.tsx +++ b/src/components/default/BackButton/BackButton.tsx @@ -1,14 +1,19 @@ import { ReactComponent as ArrowWhiteIcon } from '@/assets/images/UI/arrow_white.svg'; import Button from '@/components/UI/Button/Button'; import { useRouter } from 'next/router'; +import { classes } from '@/utils/utils'; import styles from './BackButton.module.scss'; +import { BackButtonProps } from './types'; -function BackButton() { +function BackButton({ className, isSm }: BackButtonProps) { const router = useRouter(); return ( - diff --git a/src/components/default/BackButton/types.ts b/src/components/default/BackButton/types.ts new file mode 100644 index 0000000..51a9baa --- /dev/null +++ b/src/components/default/BackButton/types.ts @@ -0,0 +1,4 @@ +export interface BackButtonProps { + className?: string; + isSm?: boolean; +} diff --git a/src/components/default/Header/Header.module.scss b/src/components/default/Header/Header.module.scss index 2560849..68cb924 100644 --- a/src/components/default/Header/Header.module.scss +++ b/src/components/default/Header/Header.module.scss @@ -12,6 +12,39 @@ &.lg { padding-inline: 60px; + height: 65px; + + .header__logo { + width: 180px; + height: 38px; + } + + .header__currency__check { + height: 48px !important; + gap: 25px !important; + } + + .header__account__wrapper { + .header__account__info { + p { + &:first-child { + font-size: 16px; + } + + font-size: 14px; + } + } + + .header__account__btn { + min-width: 48px !important; + height: 48px !important; + } + } + + .header__connect_btn { + height: 50px; + } + @media screen and (max-width: 1600px) { padding-inline: 40px; @@ -27,7 +60,7 @@ width: 202px; height: 40px; - > a { + >a { display: flex; } } @@ -77,6 +110,7 @@ .header__login { width: 100%; display: flex; + align-items: center; gap: 10px; transition: none; } @@ -106,7 +140,7 @@ .header__button__wrapper { position: relative; - > .offers__tooltip { + >.offers__tooltip { padding: 13px 20px; position: absolute; background: #11316b; @@ -206,7 +240,7 @@ display: flex; gap: 5px; - > span { + >span { max-width: 100px; overflow: hidden; text-overflow: ellipsis; @@ -231,6 +265,7 @@ } &.header__menu__mobile { + .header__account, .header__login { padding: 20px; @@ -255,11 +290,11 @@ cursor: pointer; transition: none; - > svg { + >svg { scale: 0.8; } - > div { + >div { width: 24px; height: 2px; margin-bottom: 6px; @@ -286,7 +321,7 @@ max-height: 200px; overflow: hidden; - > div { + >div { width: 100%; } @@ -391,4 +426,4 @@ background-color: #0000004c; z-index: 1; transform: all 0; -} +} \ No newline at end of file diff --git a/src/components/default/Header/Header.tsx b/src/components/default/Header/Header.tsx index e1c5cea..86d9d8f 100644 --- a/src/components/default/Header/Header.tsx +++ b/src/components/default/Header/Header.tsx @@ -355,9 +355,11 @@ function Header({ isLg }: { isLg?: boolean }) {
- +
+ {Menu()} +
diff --git a/src/components/default/Header/NavBar/NavBar.module.scss b/src/components/default/Header/NavBar/NavBar.module.scss index 87ef6fa..345de66 100644 --- a/src/components/default/Header/NavBar/NavBar.module.scss +++ b/src/components/default/Header/NavBar/NavBar.module.scss @@ -1,4 +1,25 @@ .nav { + &.lg { + a { + gap: 8px; + + h6 { + font-size: 14px; + font-weight: 600; + line-height: 140%; + } + + svg { + transform: scale(0.9); + } + + .badge { + padding: 3px; + min-width: 22px; + } + } + } + a { display: flex; align-items: center; @@ -73,4 +94,4 @@ font-size: 32px; } } -} +} \ No newline at end of file diff --git a/src/components/default/Header/NavBar/NavBar.tsx b/src/components/default/Header/NavBar/NavBar.tsx index 140ace6..d9fcfab 100644 --- a/src/components/default/Header/NavBar/NavBar.tsx +++ b/src/components/default/Header/NavBar/NavBar.tsx @@ -9,6 +9,7 @@ import NavBarProps from '@/interfaces/props/components/default/Header/NavBar/Nav import NotificationIndicator from '@/components/UI/NotificationIndicator/NotificationIndicator'; import { useContext } from 'react'; import { Store } from '@/store/store-reducer'; +import { classes } from '@/utils/utils'; import styles from './NavBar.module.scss'; function NavBar(props: NavBarProps) { @@ -40,14 +41,18 @@ function NavBar(props: NavBarProps) {
{title}
- + ); } return (