Fix NavRow on mobile
This commit is contained in:
parent
914b6c757d
commit
1423db35eb
@ -6,7 +6,7 @@ Omorphia is Modrinth's component, style, and utility library for Svelte projects
|
|||||||
- 🎨 CSS classes to easily style elements with a coherent style
|
- 🎨 CSS classes to easily style elements with a coherent style
|
||||||
- 🧰 Typed utilities to solve common tasks quick and dependably
|
- 🧰 Typed utilities to solve common tasks quick and dependably
|
||||||
- ⚙️ Configuration for SvelteKit and PostCSS to simplify setups
|
- ⚙️ Configuration for SvelteKit and PostCSS to simplify setups
|
||||||
- 🚚 A Rollup plugin to generate a cache of heavily used API requests and OpenAPI typ
|
- 🚚 A Rollup plugin to generate a cache of heavily used API requests and OpenAPI types
|
||||||
|
|
||||||
Read the documentation at [omorphia.modrinth.com.](https://omorphia.modrinth.com)
|
Read the documentation at [omorphia.modrinth.com.](https://omorphia.modrinth.com)
|
||||||
|
|
||||||
|
|||||||
@ -35,6 +35,7 @@
|
|||||||
"@sveltejs/kit": "1.0.0-next.352",
|
"@sveltejs/kit": "1.0.0-next.352",
|
||||||
"@types/cli-progress": "^3.11.0",
|
"@types/cli-progress": "^3.11.0",
|
||||||
"@types/marked": "^4.0.3",
|
"@types/marked": "^4.0.3",
|
||||||
|
"@types/throttle-debounce": "^5.0.0",
|
||||||
"@typescript-eslint/eslint-plugin": "^5.10.1",
|
"@typescript-eslint/eslint-plugin": "^5.10.1",
|
||||||
"@typescript-eslint/parser": "^5.10.1",
|
"@typescript-eslint/parser": "^5.10.1",
|
||||||
"eslint": "^7.32.0",
|
"eslint": "^7.32.0",
|
||||||
|
|||||||
6
pnpm-lock.yaml
generated
6
pnpm-lock.yaml
generated
@ -12,6 +12,7 @@ specifiers:
|
|||||||
'@sveltejs/kit': 1.0.0-next.352
|
'@sveltejs/kit': 1.0.0-next.352
|
||||||
'@types/cli-progress': ^3.11.0
|
'@types/cli-progress': ^3.11.0
|
||||||
'@types/marked': ^4.0.3
|
'@types/marked': ^4.0.3
|
||||||
|
'@types/throttle-debounce': ^5.0.0
|
||||||
'@typescript-eslint/eslint-plugin': ^5.10.1
|
'@typescript-eslint/eslint-plugin': ^5.10.1
|
||||||
'@typescript-eslint/parser': ^5.10.1
|
'@typescript-eslint/parser': ^5.10.1
|
||||||
cli-progress: ^3.11.1
|
cli-progress: ^3.11.1
|
||||||
@ -92,6 +93,7 @@ devDependencies:
|
|||||||
'@sveltejs/kit': 1.0.0-next.352_svelte@3.48.0
|
'@sveltejs/kit': 1.0.0-next.352_svelte@3.48.0
|
||||||
'@types/cli-progress': 3.11.0
|
'@types/cli-progress': 3.11.0
|
||||||
'@types/marked': 4.0.3
|
'@types/marked': 4.0.3
|
||||||
|
'@types/throttle-debounce': 5.0.0
|
||||||
'@typescript-eslint/eslint-plugin': 5.14.0_4p27j37cxves4nxlnqogdhp4ta
|
'@typescript-eslint/eslint-plugin': 5.14.0_4p27j37cxves4nxlnqogdhp4ta
|
||||||
'@typescript-eslint/parser': 5.14.0_e6rt7vlgxfprtuallp2t3cvyi4
|
'@typescript-eslint/parser': 5.14.0_e6rt7vlgxfprtuallp2t3cvyi4
|
||||||
eslint: 7.32.0
|
eslint: 7.32.0
|
||||||
@ -1199,6 +1201,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ==}
|
resolution: {integrity: sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ==}
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
|
/@types/throttle-debounce/5.0.0:
|
||||||
|
resolution: {integrity: sha512-Pb7k35iCGFcGPECoNE4DYp3Oyf2xcTd3FbFQxXUI9hEYKUl6YX+KLf7HrBmgVcD05nl50LIH6i+80js4iYmWbw==}
|
||||||
|
dev: true
|
||||||
|
|
||||||
/@types/unist/2.0.6:
|
/@types/unist/2.0.6:
|
||||||
resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==}
|
resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==}
|
||||||
dev: true
|
dev: true
|
||||||
|
|||||||
@ -34,7 +34,7 @@
|
|||||||
font-weight: var(--font-weight-bold);
|
font-weight: var(--font-weight-bold);
|
||||||
|
|
||||||
:global(i) {
|
:global(i) {
|
||||||
font-weight: var(--font-weight-normal);
|
font-weight: var(--font-weight-regular);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
import { browser, prerendering } from '$app/env'
|
import { browser, prerendering } from '$app/env'
|
||||||
import { page } from '$app/stores'
|
import { page } from '$app/stores'
|
||||||
import { onMount } from 'svelte'
|
import { onMount } from 'svelte'
|
||||||
|
import { debounce } from 'throttle-debounce'
|
||||||
|
|
||||||
interface Link {
|
interface Link {
|
||||||
href: string
|
href: string
|
||||||
@ -42,11 +43,10 @@
|
|||||||
|
|
||||||
const linkElements: HTMLAnchorElement[] = []
|
const linkElements: HTMLAnchorElement[] = []
|
||||||
|
|
||||||
let indicatorReady = false
|
|
||||||
|
|
||||||
const indicator = {
|
const indicator = {
|
||||||
left: 0,
|
left: 0,
|
||||||
right: 0,
|
right: 0,
|
||||||
|
top: 0,
|
||||||
direction: 'right',
|
direction: 'right',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -60,18 +60,23 @@
|
|||||||
linkElements[activeIndex].parentElement.offsetWidth -
|
linkElements[activeIndex].parentElement.offsetWidth -
|
||||||
linkElements[activeIndex].offsetLeft -
|
linkElements[activeIndex].offsetLeft -
|
||||||
linkElements[activeIndex].offsetWidth
|
linkElements[activeIndex].offsetWidth
|
||||||
|
indicator.top = linkElements[activeIndex].offsetTop + linkElements[activeIndex].offsetHeight - 2
|
||||||
|
|
||||||
oldIndex = activeIndex
|
oldIndex = activeIndex
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let useAnimation = false
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
indicatorReady = true
|
useAnimation = true
|
||||||
}, 300)
|
}, 300)
|
||||||
|
|
||||||
|
window.addEventListener('resize', debounce(100, startAnimation))
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<nav class="navigation" class:static-indicator={!indicatorReady}>
|
<nav class="navigation" class:use-animation={useAnimation}>
|
||||||
{#each links as link, index}
|
{#each links as link, index}
|
||||||
<a
|
<a
|
||||||
href={query
|
href={query
|
||||||
@ -93,12 +98,15 @@
|
|||||||
{/each}
|
{/each}
|
||||||
<div
|
<div
|
||||||
class="navigation__indicator"
|
class="navigation__indicator"
|
||||||
style:visibility={indicatorReady && activeIndex !== -1 ? 'visible' : 'hidden'}
|
style:visibility={useAnimation && activeIndex !== -1 ? 'visible' : 'hidden'}
|
||||||
style:left={indicator.left + 'px'}
|
style:left={indicator.left + 'px'}
|
||||||
style:right={indicator.right + 'px'}
|
style:right={indicator.right + 'px'}
|
||||||
|
style:top={indicator.top + 'px'}
|
||||||
style:transition={`left 350ms ${
|
style:transition={`left 350ms ${
|
||||||
indicator.direction === 'left' ? FAST_TIMING : SLOW_TIMING
|
indicator.direction === 'left' ? FAST_TIMING : SLOW_TIMING
|
||||||
},right 350ms ${indicator.direction === 'right' ? FAST_TIMING : SLOW_TIMING}`} />
|
},right 350ms ${
|
||||||
|
indicator.direction === 'right' ? FAST_TIMING : SLOW_TIMING
|
||||||
|
}, top 100ms ease-in-out`} />
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<style lang="postcss">
|
<style lang="postcss">
|
||||||
@ -115,10 +123,6 @@
|
|||||||
color: var(--color-text-light);
|
color: var(--color-text-light);
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
&.is-active {
|
|
||||||
color: var(--color-text);
|
|
||||||
}
|
|
||||||
|
|
||||||
&::after {
|
&::after {
|
||||||
content: '';
|
content: '';
|
||||||
display: block;
|
display: block;
|
||||||
@ -134,32 +138,39 @@
|
|||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
color: var(--color-text);
|
color: var(--color-text);
|
||||||
}
|
|
||||||
|
|
||||||
&:hover::after {
|
&::after {
|
||||||
opacity: 0.4;
|
opacity: 0.4;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
&:active::after {
|
&:active::after {
|
||||||
opacity: 0.1;
|
opacity: 0.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.is-active {
|
||||||
|
color: var(--color-text);
|
||||||
|
|
||||||
|
&::after {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.static-indicator {
|
&.use-animation {
|
||||||
.navigation__link {
|
.navigation__link {
|
||||||
&.is-active::after {
|
&.is-active::after {
|
||||||
opacity: 1;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&__indicator {
|
&__indicator {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: -2px;
|
|
||||||
height: 0.25rem;
|
height: 0.25rem;
|
||||||
border-radius: var(--rounded-max);
|
border-radius: var(--rounded-max);
|
||||||
background-color: var(--color-brand);
|
background-color: var(--color-brand);
|
||||||
transition-property: left, right;
|
transition-property: left, right, top;
|
||||||
transition-duration: 350ms;
|
transition-duration: 350ms;
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,18 +9,13 @@
|
|||||||
--lh-default: 1.5;
|
--lh-default: 1.5;
|
||||||
|
|
||||||
/* Font weights */
|
/* Font weights */
|
||||||
--font-weight-light: 300;
|
--font-weight-regular: 400;
|
||||||
--font-weight-normal: 400;
|
--font-weight-medium: 600;
|
||||||
--font-weight-semibold: 500;
|
--font-weight-bold: 700;
|
||||||
--font-weight-bold: 600;
|
|
||||||
|
|
||||||
/* Font stacks */
|
/* Font stacks */
|
||||||
--body-font: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica Neue, Helvetica,
|
--body-font: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica Neue, Helvetica,
|
||||||
Oxygen, Ubuntu, Roboto, Cantarell, Fira Sans, Droid Sans, 'Apple Color Emoji', 'Segoe UI Emoji',
|
Oxygen, Ubuntu, Roboto, Cantarell, Fira Sans, Droid Sans, 'Apple Color Emoji', 'Segoe UI Emoji',
|
||||||
Arial, sans-serif;
|
Arial, sans-serif;
|
||||||
--mono-font: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
|
--mono-font: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
|
||||||
|
|
||||||
--font-weight-regular: 400;
|
|
||||||
--font-weight-medium: 600;
|
|
||||||
--font-weight-bold: 700;
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user