Skip to content

Commit e95e22a

Browse files
authored
chore: Merge branch dev to main (#284)
2 parents 459e726 + 5746a7d commit e95e22a

File tree

6 files changed

+42
-24
lines changed

6 files changed

+42
-24
lines changed

src/layout/Footer/FooterSection.svelte

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<script lang="ts">
2-
import { slide } from 'svelte/transition';
3-
import { quintOut } from 'svelte/easing';
4-
5-
import ChevronDown from 'svelte-material-icons/ChevronDown.svelte';
6-
72
export let title: string;
8-
let expanded: boolean = false;
93
</script>
104

115
<div class="desktop-only">
@@ -16,20 +10,14 @@
1610
</div>
1711

1812
<div class="mobile-only">
19-
<!-- svelte-ignore a11y-click-events-have-key-events -->
20-
<button class="title" on:click={() => (expanded = !expanded)}>
13+
<button class="title">
2114
<span>
2215
{title}
2316
</span>
24-
<div class="arrow" style:transform={expanded ? 'rotate(180deg)' : 'rotate(0deg)'}>
25-
<ChevronDown size="24px" color="var(--surface-six)" />
26-
</div>
2717
</button>
28-
{#if expanded}
29-
<ul transition:slide={{ easing: quintOut, duration: 500 }}>
30-
<slot />
31-
</ul>
32-
{/if}
18+
<ul>
19+
<slot />
20+
</ul>
3321
</div>
3422

3523
<style lang="scss">

src/layout/Hero/HeroImage.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
background-color: var(--surface-seven);
2121
user-select: none;
2222
}
23-
@media (max-width: 1700px) {
23+
@media screen and (max-width: 1700px) {
2424
.hero-img {
2525
height: 100vh;
2626
right: 6rem;

src/layout/Hero/HeroSection.svelte

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,9 @@
4646
}
4747
4848
.social-buttons {
49-
justify-content: center;
49+
max-width: 30rem;
5050
position: absolute;
5151
bottom: 1rem;
52-
z-index: 1;
5352
transition: opacity 0.1s var(--bezier-one);
5453
}
5554
@@ -69,18 +68,41 @@
6968
span {
7069
color: var(--primary);
7170
}
72-
@media (max-width: 1700px) {
71+
72+
@media screen and (max-width: 1700px) {
7373
.hero {
7474
height: 80vh;
7575
}
7676
}
7777
78+
@media screen and (max-height: 820px) {
79+
.social-buttons {
80+
bottom: initial;
81+
left: initial;
82+
position: initial;
83+
width: initial;
84+
opacity: 100% !important;
85+
}
86+
}
87+
@media screen and (max-width: 1100px) or (min-height: 820px) {
88+
.social-buttons {
89+
transform: translateX(-50%);
90+
width: 100%;
91+
position: absolute;
92+
justify-content: center;
93+
}
94+
}
95+
7896
@media screen and (max-width: 450px) {
7997
.internal-buttons {
8098
flex-direction: column;
8199
gap: 1rem;
82100
}
83101
102+
.social-buttons {
103+
justify-content: center;
104+
}
105+
84106
.hero {
85107
height: initial;
86108
}

src/layout/Navbar/NavHost.svelte

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@
202202
}
203203
204204
#nav-container {
205+
z-index: 1;
205206
top: 0;
206207
position: sticky;
207208
width: 100%;

src/lib/components/Wave.svelte

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,18 @@
1616
svg {
1717
transition: opacity 0.1s var(--bezier-one);
1818
position: absolute;
19-
bottom: 0rem;
19+
bottom: -1px;
20+
z-index: -1;
2021
width: 100%;
2122
height: 40vh;
2223
}
2324
25+
@media screen and (max-height: 820px) {
26+
svg {
27+
opacity: 0 !important;
28+
}
29+
}
30+
2431
.wave {
2532
animation: wave-anim 30s;
2633
animation-timing-function: cubic-bezier(0.5, 0, 0.5, 1);

src/routes/+page.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
onMount(() => {
1212
const checkVisibility = () => {
1313
const wave = document.querySelector('.wave');
14-
bottomVisibility = !(wave && wave.getBoundingClientRect().bottom < window.innerHeight);
14+
bottomVisibility = !(wave && wave.getBoundingClientRect().bottom < window.innerHeight - 1);
1515
};
1616
1717
window.addEventListener('scroll', checkVisibility, { passive: true });
@@ -165,10 +165,10 @@
165165
}
166166
167167
.hero-img-container {
168-
z-index: 1;
168+
z-index: 0;
169169
}
170170
171-
@media (max-width: 1100px) {
171+
@media screen and (max-width: 1100px) {
172172
.hero-img-container {
173173
display: none;
174174
}

0 commit comments

Comments
 (0)