Skip to content

refactor: adjust styles for Chrome, Safari and Mozilla Firefox #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: sprint_5/refactor
Choose a base branch
from
Open

refactor: adjust styles for Chrome, Safari and Mozilla Firefox #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified public/fonts/Inter-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added public/fonts/Inter-Light.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified public/fonts/Inter-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified public/fonts/Inter-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added public/fonts/Inter-SemiBold.ttf
View file
Open in desktop
Binary file not shown.
11 changes: 5 additions & 6 deletions src/components/AboutTabs/Tab/tab.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@
position: relative;
overflow: hidden;
border-radius: 4rem;
width: 100%;
height: fit-content;
margin-bottom: 2rem;
background-color: rgba($primary, 0.1);

Expand All @@ -108,16 +106,17 @@

&__img {
display: block;
width: auto;
height: 100%;
object-fit: cover;
width: 100%;
height: auto;
object-fit: contain;
}

&__title {
width: 10%;
margin-bottom: 2rem;
margin-bottom: 2.5rem;
font-size: 4rem;
line-height: 1;
font-weight: 600;
}

&__role {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Breadcrumbs/breadcrumbs.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
transition: all 0.2s;

&:hover {
opacity: 0.5;
opacity: 0.8;
}
}

Expand Down
7 changes: 3 additions & 4 deletions src/components/Filters/CategoryFilter/categoryFilter.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@
justify-content: flex-start;
}


&__item {
margin-bottom: 0.5rem;
line-height: 1;

button {
position: relative;

font-weight: 600;
transition: all 0.1s;

&::after {
Expand Down Expand Up @@ -48,4 +47,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/components/Filters/filters.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}

&__btn {
@include font(semibold, h2, $dark);
@include btn-secondary();
width: 100%;
height: 80px;
display: flex;
Expand Down
45 changes: 23 additions & 22 deletions src/components/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import { selectCart } from '../../store/cart/selectors';
import { PATH } from '../../router/constants/paths';
import { Page } from '../../router/types';
import { getCartThunk } from '../../store/cart/thunks';
import { resetUserData } from '../../store/user/slice';

import Logo from '../../assets/icons/logo.svg';
import CartIcon from '../../assets/icons/icon-cart.svg';

import classnames from 'classnames';
import styles from './header.module.scss';
import { resetUserData } from '../../store/user/slice';

export default function Header(): ReactElement {
const [menuOpen, setMenuOpen] = useState(false);
Expand Down Expand Up @@ -77,73 +77,74 @@ export default function Header(): ReactElement {
<Logo />
</Link>

<div className={styles.header__nav}>
<nav className={styles.header__nav}>
<Link
to={'#'}
onClick={toggleMenu}
className={classnames(styles.header__nav_button, menuOpen ? styles.header__nav_buttonActive : '')}
className={classnames(styles.header__nav_button, menuOpen ? styles.active : '')}
>
Menu
</Link>

{!isAuthPage && (
<nav className={classnames(styles.nav, menuOpen ? styles.open : '')}>
<ul className={classnames(styles.nav__list, styles.list)}>
<li className={styles.list__item}>
<NavLink to={PATH[Page.Catalog]} className={styles.list__item_link} onClick={closeMenu}>
<div className={classnames(styles.links)}>
<ul className={classnames(styles.links__list, menuOpen ? styles.open : '')}>
<li className={styles.links__item}>
<NavLink to={PATH[Page.Catalog]} className={styles.links__item_link} onClick={closeMenu}>
Catalog
</NavLink>
</li>

{!isAuthorized ? (
<>
<li className={styles.list__item}>
<NavLink to={PATH[Page.About]} className={styles.list__item_link} onClick={closeMenu}>
<li className={styles.links__item}>
<NavLink to={PATH[Page.About]} className={styles.links__item_link} onClick={closeMenu}>
About
</NavLink>
</li>
<li className={styles.list__item}>
<NavLink to={PATH[Page.Login]} className={styles.list__item_link} onClick={closeMenu}>
<li className={styles.links__item}>
<NavLink to={PATH[Page.Login]} className={styles.links__item_link} onClick={closeMenu}>
Login
</NavLink>
</li>
<li className={styles.list__item}>
<NavLink to={PATH[Page.Register]} className={styles.list__item_link} onClick={closeMenu}>
<li className={styles.links__item}>
<NavLink to={PATH[Page.Register]} className={styles.links__item_link} onClick={closeMenu}>
Register
</NavLink>
</li>
</>
) : (
<>
<li className={styles.list__item}>
<NavLink to={PATH[Page.Profile]} className={styles.list__item_link} onClick={closeMenu}>
<li className={styles.links__item}>
<NavLink to={PATH[Page.Profile]} className={styles.links__item_link} onClick={closeMenu}>
Profile
</NavLink>
</li>
<li className={styles.list__item}>
<NavLink to={PATH[Page.About]} className={styles.list__item_link} onClick={closeMenu}>
<li className={styles.links__item}>
<NavLink to={PATH[Page.About]} className={styles.links__item_link} onClick={closeMenu}>
About
</NavLink>
</li>
<li className={styles.list__item}>
<Link to={PATH[Page.Home]} onClick={handleLogout} className={styles.list__item_link}>
<li className={styles.links__item}>
<Link to={PATH[Page.Home]} onClick={handleLogout} className={styles.links__item_link}>
Logout
</Link>
</li>
</>
)}
</ul>
</nav>
</div>
)}

<NavLink
to={PATH[Page.Cart]}
className={classnames(styles.nav__link, styles.nav__link_cart)}
className={classnames(styles.links__item_link, styles.links__item_cart)}
onClick={closeMenu}
>
<CartIcon />
<span className={styles.icon__count}>{basket.lineItems.length}</span>
</NavLink>
</div>
</nav>
</div>
</header>
);
Expand Down
Loading