diff --git a/src/components/Elements/MainModal/Main.jsx b/src/components/Elements/MainModal/Main.jsx index 82b98547..1caa13bc 100644 --- a/src/components/Elements/MainModal/Main.jsx +++ b/src/components/Elements/MainModal/Main.jsx @@ -181,20 +181,22 @@ function MainModal({ modalClose, deepLinkData }) { canGoBack={canGoBack} canGoForward={canGoForward} /> - }> - - +
+ }> + + +
); } diff --git a/src/components/Elements/MainModal/backend/Tabs.jsx b/src/components/Elements/MainModal/backend/Tabs.jsx index dcfcaa7e..db5a1c8f 100644 --- a/src/components/Elements/MainModal/backend/Tabs.jsx +++ b/src/components/Elements/MainModal/backend/Tabs.jsx @@ -5,7 +5,13 @@ import ReminderInfo from '../components/ReminderInfo'; import ErrorBoundary from '../../../../features/misc/modals/ErrorBoundary'; import { TAB_TYPES } from '../constants/tabConfig'; -const Tabs = ({ children, navbar = false, currentTab: activeTab, onSectionChange, resetToFirst }) => { +const Tabs = ({ + children, + navbar = false, + currentTab: activeTab, + onSectionChange, + resetToFirst, +}) => { const [currentTab, setCurrentTab] = useState(children[0]?.props.label); const [currentName, setCurrentName] = useState(children[0]?.props.name); const [showReminder, setShowReminder] = useState(localStorage.getItem('showReminder') === 'true'); @@ -51,7 +57,7 @@ const Tabs = ({ children, navbar = false, currentTab: activeTab, onSectionChange const showSidebar = activeTab === TAB_TYPES.SETTINGS || activeTab === TAB_TYPES.DISCOVER; return ( -
+
{showSidebar ? (
{children.map((tab, index) => ( diff --git a/src/components/Elements/MainModal/scss/index.scss b/src/components/Elements/MainModal/scss/index.scss index 8ba6f15d..99f2569b 100644 --- a/src/components/Elements/MainModal/scss/index.scss +++ b/src/components/Elements/MainModal/scss/index.scss @@ -31,7 +31,7 @@ transition-timing-function: ease-in; border-radius: map.get($modal, 'border-radius'); user-select: none; - overflow-y: auto; + overflow: hidden; transform: scale(0); transition: all 0.3s cubic-bezier(0.47, 1.64, 0.41, 0.8); diff --git a/src/components/Elements/MainModal/scss/modules/_modalTabContent.scss b/src/components/Elements/MainModal/scss/modules/_modalTabContent.scss index e7673b95..a0a6fe24 100644 --- a/src/components/Elements/MainModal/scss/modules/_modalTabContent.scss +++ b/src/components/Elements/MainModal/scss/modules/_modalTabContent.scss @@ -8,10 +8,12 @@ } */ @include themed { - padding: 1rem 3rem 3rem; + padding: 1rem 3rem 4rem; display: flex; flex-direction: column; width: 100%; + height: 100%; + overflow-y: auto; background: t($modal-background); margin: 0 1rem; diff --git a/src/components/Elements/MainModal/scss/modules/_sidebar.scss b/src/components/Elements/MainModal/scss/modules/_sidebar.scss index e4dec96e..1eeff011 100644 --- a/src/components/Elements/MainModal/scss/modules/_sidebar.scss +++ b/src/components/Elements/MainModal/scss/modules/_sidebar.scss @@ -2,16 +2,16 @@ .modalSidebar { @include themed { - top: 0; - left: 0; - position: sticky; + position: relative; margin: 0; - padding: 0 5px; + padding: 0.5rem 5px 2rem 5px; // background: t($modal-sidebar); border-radius: 12px 0 0 12px; - overflow: hidden auto; - height: 80vh; + overflow-y: auto; + overflow-x: hidden; + height: 100%; min-width: 250px; + flex-shrink: 0; svg { margin-left: 20px; diff --git a/src/components/Elements/MainModal/scss/modules/_topBar.scss b/src/components/Elements/MainModal/scss/modules/_topBar.scss index 91c03d22..82f36b2d 100644 --- a/src/components/Elements/MainModal/scss/modules/_topBar.scss +++ b/src/components/Elements/MainModal/scss/modules/_topBar.scss @@ -1,20 +1,18 @@ @use 'scss/variables' as *; .modalTopBar { - position: sticky; - top: 0; - z-index: 10; + position: relative; + flex-shrink: 0; + z-index: 100; display: flex; align-items: center; justify-content: space-between; padding: 1.5rem 1.5rem; // width: 100%; - - @include themed { - background: t($modal); - } - - backdrop-filter: blur(10px); + + background-color: rgba(1, 1, 1, 0.9); + -webkit-backdrop-filter: blur(16px) saturate(180%); + backdrop-filter: blur(16px) saturate(180%); border-bottom: 1px solid rgba(255, 255, 255, 0.1); .topBarLeft { diff --git a/src/scss/index.scss b/src/scss/index.scss index e9ca11b7..a1fccaa0 100644 --- a/src/scss/index.scss +++ b/src/scss/index.scss @@ -79,6 +79,9 @@ body { .frame { width: 100%; height: 100%; + display: flex; + flex-direction: column; + overflow: hidden; } /* fonts (imported from fontsource) */ @@ -90,8 +93,9 @@ body { font-weight: 400; src: url('../../node_modules/@fontsource/lexend-deca/files/lexend-deca-latin-400-normal.woff2') format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, - U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, + U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } @font-face { @@ -101,8 +105,9 @@ body { font-weight: 400; src: url('../../node_modules/@fontsource/lexend-deca/files/lexend-deca-latin-ext-400-normal.woff2') format('woff2'); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, - U+2C60-2C7F, U+A720-A7FF; + unicode-range: + U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, + U+A720-A7FF; } @font-face {