Skip to content
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.

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

Over page #295

Merged
merged 21 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions src/lib/atoms/icons/logoround.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,16 @@ l-38 23 -40 -37 c-66 -59 -139 -87 -228 -88 -90 0 -140 13 -203 55 -66 44 -98
display: none;
}
}

@media (min-width: 48rem) and (max-width: 64rem) {
svg{
display: none;
}
}

@media (min-width: 30em) {
svg {
display: none;
}
}
</style>
3 changes: 2 additions & 1 deletion src/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ export { default as FontIncrease } from '$lib/atoms/icons/font-increase.svelte';
export { default as Translate } from '$lib/atoms/icons/translate.svelte';
export { default as Logo } from '$lib/atoms/icons/logo.svelte';
export { default as Logoround } from '$lib/atoms/icons/logoround.svelte';
// export { default as OtherRoundDot } from '$lib/atoms/icons/other-round-dot.svelte';
export { default as Projectenrounddot } from '$lib/atoms/icons/Projecten-round-dot.svelte';
export { default as ArrowDown } from '$lib/atoms/icons/arrow-down.svelte';


// =========== MOLECULES ===========

export { default as HeroSlider } from '$lib/molecules/hero-slider.svelte';
Expand Down
6 changes: 2 additions & 4 deletions src/routes/+layout.svelte
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<script>
export let data;
import { Menu, AccessibilityMenu, Footer } from '$lib/index.js';
import { Menu, Footer } from '$lib/index.js';
</script>

<Menu/>

<!-- <AccessibilityMenu /> -->

<Menu/>
<slot />
<Footer {data} />
10 changes: 1 addition & 9 deletions src/routes/+page.server.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,6 @@ export async function load() {
paragraph
paragraph2
}
geveltuins {
id
title
bulletText1
createdAt
image {
url
}
}

facadeGardenActions {
id
Expand All @@ -74,6 +65,7 @@ export async function load() {
description
description2
description3
description4
id
title
}
Expand Down
9 changes: 0 additions & 9 deletions src/routes/geveltuin/+page.server.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@ export async function load() {
url
}
}
geveltuins {
id
title
bulletText1
createdAt
image {
url
}
}

facadeGardenActions {
id
Expand Down
1 change: 1 addition & 0 deletions src/routes/over/+page.server.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export async function load() {
description
description2
description3
description4
id
title
}
Expand Down
71 changes: 58 additions & 13 deletions src/routes/over/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<script>
export let data;
import OtherRoundDot from '$lib/atoms/icons/ other-round-dot.svelte';
import { HeroHeaders, IntroHeaders, Logoround } from '$lib/index.js';
import { HeroHeaders, Logoround, Projectenrounddot } from '$lib/index.js';
</script>

<HeroHeaders heroInfo={data.heroHeaders[6]} />

<main>
<section>
<div>
<OtherRoundDot svgFill="var(--main-color-orange)" />
<Projectenrounddot svgFill="var(--main-color-orange)" />
<h2>
<strong class="first-four">{data.abouts[0].title.slice(0, 4)}</strong>
<strong>{data.abouts[0].title.slice(4)}</strong>
Expand All @@ -20,10 +19,12 @@
<p>{data.abouts[0].description}</p>
<p>{data.abouts[0].description2}</p>
<p>{data.abouts[0].description3}</p>
<p>{data.abouts[0].description4}</p>
</section>
</main>

<style>
/* MOBILE */
main {
width: 100%;
margin-bottom: 2rem;
Expand All @@ -37,7 +38,7 @@
section > div {
width: 100%;
display: flex;
margin-left: -0.5em;
margin-left: -0.6em;
}

h2 {
Expand All @@ -50,7 +51,7 @@

.first-four {
color: var(--main-color-brown);
margin-right: 0.3em;
margin-right: 0.1em;
}

p {
Expand All @@ -59,7 +60,14 @@
font-family: 'Poppins-Regular';
}

@media (min-width: 75em) {
p:nth-child(6) {
font-style: oblique;
font-weight: bolder;
}

/* MEDIA QUERY STYLING */
/* DESKTOP */
@media (min-width: 64em) {
main {
top: -1em;
width: 80vw;
Expand All @@ -72,31 +80,40 @@

main::after {
top: -4rem;
width: 27rem;
width: 25rem;
opacity: 0.5;
right: -9rem;
right: -8rem;
position: absolute;
transform: rotate(-45deg);
content: url(/assets/leaf-orange.svg);
}

section > div {
margin-left: -0.1em;
}

h2,
p {
width: 47vw;
display: flex;
margin: 0 auto;
}

h2 {
font-size: 3.5em;
}

.first-four {
margin-right: 0.3em;
}

p {
margin-top: 1.5em;
}
}

@media (min-width: 48em) {
h2 {
font-size: 3.5em;
}

/* TABLET */
@media (min-width: 48rem) and (max-width: 64rem) {
main {
top: -1em;
width: 85vw;
Expand All @@ -106,14 +123,42 @@
border-radius: var(--border-bigCard);
}

main::after {
width: 22rem;
}

section > div {
margin-left: -0.1em;
}

h2 {
font-size: 3em;
}
}

/* BIG DESKTOP SCREEN */
@media (min-width: 100rem) {
main {
width: 78vw;
}

main::after {
width: 30rem;
}

h2 {
font-size: 5em;
}

h2,
p {
max-width: 40vw;
}

p {
font-size: 1.5em;
line-height: 1.5em;
margin-top: 1.5em;
}
}
</style>