From f423f22741f13721d34b037674bf158df4363fc4 Mon Sep 17 00:00:00 2001 From: Ilya Y <75578537+ilya-bkv@users.noreply.github.com> Date: Sat, 26 Aug 2023 12:41:21 +0300 Subject: [PATCH] Update header z index (#194) --- src/components/Article/FullArticle.tsx | 2 +- src/components/Feed/ArticleCard.tsx | 2 +- .../Nav/{ => Header}/Header.module.scss | 2 +- src/components/Nav/{ => Header}/Header.tsx | 24 +++++++++---------- src/components/Nav/Header/index.ts | 1 + src/components/Nav/HeaderAuth.tsx | 2 +- src/components/Nav/Modal/Modal.module.scss | 2 +- 7 files changed, 18 insertions(+), 17 deletions(-) rename src/components/Nav/{ => Header}/Header.module.scss (99%) rename src/components/Nav/{ => Header}/Header.tsx (91%) create mode 100644 src/components/Nav/Header/index.ts diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx index 234ac307..93578908 100644 --- a/src/components/Article/FullArticle.tsx +++ b/src/components/Article/FullArticle.tsx @@ -24,7 +24,7 @@ import { AudioPlayer } from './AudioPlayer' import { SharePopup } from './SharePopup' import { ShoutRatingControl } from './ShoutRatingControl' import { CommentsTree } from './CommentsTree' -import stylesHeader from '../Nav/Header.module.scss' +import stylesHeader from '../Nav/Header/Header.module.scss' import { AudioHeader } from './AudioHeader' import { Popover } from '../_shared/Popover' diff --git a/src/components/Feed/ArticleCard.tsx b/src/components/Feed/ArticleCard.tsx index 732bfb19..3b4ed6ff 100644 --- a/src/components/Feed/ArticleCard.tsx +++ b/src/components/Feed/ArticleCard.tsx @@ -7,7 +7,7 @@ import { clsx } from 'clsx' import { CardTopic } from './CardTopic' import { ShoutRatingControl } from '../Article/ShoutRatingControl' import { getShareUrl, SharePopup } from '../Article/SharePopup' -import stylesHeader from '../Nav/Header.module.scss' +import stylesHeader from '../Nav/Header/Header.module.scss' import { getDescription } from '../../utils/meta' import { FeedArticlePopup } from './FeedArticlePopup' import { useLocalize } from '../../context/localize' diff --git a/src/components/Nav/Header.module.scss b/src/components/Nav/Header/Header.module.scss similarity index 99% rename from src/components/Nav/Header.module.scss rename to src/components/Nav/Header/Header.module.scss index 6c6c59bb..1a43eaec 100644 --- a/src/components/Nav/Header.module.scss +++ b/src/components/Nav/Header/Header.module.scss @@ -5,7 +5,7 @@ margin-bottom: 2.2rem; position: absolute; width: 100%; - z-index: 10; + z-index: 10000; .wide-container { background: #fff; diff --git a/src/components/Nav/Header.tsx b/src/components/Nav/Header/Header.tsx similarity index 91% rename from src/components/Nav/Header.tsx rename to src/components/Nav/Header/Header.tsx index 614597da..5bc6f628 100644 --- a/src/components/Nav/Header.tsx +++ b/src/components/Nav/Header/Header.tsx @@ -2,21 +2,21 @@ import { Show, createSignal, createEffect, onMount, onCleanup } from 'solid-js' import { getPagePath, redirectPage } from '@nanostores/router' import { clsx } from 'clsx' -import { Modal } from './Modal' -import { AuthModal } from './AuthModal' -import { HeaderAuth } from './HeaderAuth' -import { ConfirmModal } from './ConfirmModal' -import { getShareUrl, SharePopup } from '../Article/SharePopup' -import { Snackbar } from './Snackbar' -import { Icon } from '../_shared/Icon' +import { Modal } from '../Modal' +import { AuthModal } from '../AuthModal' +import { HeaderAuth } from '../HeaderAuth' +import { ConfirmModal } from '../ConfirmModal' +import { getShareUrl, SharePopup } from '../../Article/SharePopup' +import { Snackbar } from '../Snackbar' +import { Icon } from '../../_shared/Icon' -import { useModalStore } from '../../stores/ui' -import { router, useRouter } from '../../stores/router' +import { useModalStore } from '../../../stores/ui' +import { router, useRouter } from '../../../stores/router' -import { getDescription } from '../../utils/meta' +import { getDescription } from '../../../utils/meta' -import { useLocalize } from '../../context/localize' -import { useSession } from '../../context/session' +import { useLocalize } from '../../../context/localize' +import { useSession } from '../../../context/session' import styles from './Header.module.scss' diff --git a/src/components/Nav/Header/index.ts b/src/components/Nav/Header/index.ts new file mode 100644 index 00000000..e0e2673a --- /dev/null +++ b/src/components/Nav/Header/index.ts @@ -0,0 +1 @@ +export { Header } from './Header' diff --git a/src/components/Nav/HeaderAuth.tsx b/src/components/Nav/HeaderAuth.tsx index 6eaae6a8..1c7de728 100644 --- a/src/components/Nav/HeaderAuth.tsx +++ b/src/components/Nav/HeaderAuth.tsx @@ -1,4 +1,4 @@ -import styles from './Header.module.scss' +import styles from './Header/Header.module.scss' import { clsx } from 'clsx' import { router, useRouter } from '../../stores/router' import { Icon } from '../_shared/Icon' diff --git a/src/components/Nav/Modal/Modal.module.scss b/src/components/Nav/Modal/Modal.module.scss index 47098b1f..f0b55f3e 100644 --- a/src/components/Nav/Modal/Modal.module.scss +++ b/src/components/Nav/Modal/Modal.module.scss @@ -10,7 +10,7 @@ position: fixed; top: 0; width: 100%; - z-index: 100; + z-index: 11000; } .modal {