Skip to content

PREVIEW ONLY - Feature [WEB-39] Add Spline #15

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.

Sign up for GitHub

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

Open
uncenteredDiv wants to merge 10 commits into
base: main
Choose a base branch
from
Open

PREVIEW ONLY - Feature [WEB-39] Add Spline #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7687ad7
feat: [WEB-32] add Spline Test Preview
uncenteredDiv May 26, 2024
23b08bb
feat: [WEB-32] add aspect-ratio to spline container
uncenteredDiv May 26, 2024
481e2af
Merge branch 'refs/heads/main' into feature/web-39-add-spline
uncenteredDiv Jun 5, 2024
635cfd7
feat: [WEB-39] update Spline integration
uncenteredDiv Jun 5, 2024
bd03c6b
feat: [WEB-39] adapt Intro / Ticket styles for Spline
uncenteredDiv Jun 6, 2024
f588e13
Merge branch 'refs/heads/main' into feature/web-39-add-spline
uncenteredDiv Jun 9, 2024
4e68921
feat: [WEB-39] improve mobile spline styles
uncenteredDiv Jun 9, 2024
e3e505b
feat: [WEB-39] improve header styles for home
uncenteredDiv Jun 9, 2024
56f7485
feat: [WEB-39] improve spline styles
uncenteredDiv Jun 9, 2024
6b07fc8
feat: [WEB-39] improve spline styles #2
uncenteredDiv Jun 9, 2024
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
1 change: 0 additions & 1 deletion src/assets/intro/introDesktop.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/assets/intro/introMobile.svg
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions src/components/Header.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,4 +318,17 @@ const menuItems =
letter-spacing: getLetterSpacing(14, 1, 1);
}
}

:global(.home) .header {
background: transparent;
animation: blend 1s linear forwards;
animation-timeline: scroll();
animation-range: 0 pxToRem(240);

@keyframes blend {
to {
background: var(--color-black);
}
}
}
</style>
27 changes: 27 additions & 0 deletions src/components/Spline.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---

---

<script
type="module"
src="https://unpkg.com/@splinetool/viewer/build/spline-viewer.js"></script>
<spline-viewer
url="https://prod.spline.design/e93fTx7o7JPfIoAW/scene.splinecode"
events-target="global"
class="spline"></spline-viewer>

<style lang="scss">
@import "../styles/_imports.scss";

.spline {
aspect-ratio: 1;

@include breakpoint-up("sm") {
aspect-ratio: 4 / 3;
}

@include breakpoint-up("lg") {
aspect-ratio: 5 / 3;
}
}
</style>
4 changes: 2 additions & 2 deletions src/components/Ticket.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

.ticket {
position: absolute;
inset: auto 5cqw clamp(6rem, 27.5cqw, 11.5rem) 5cqw;
inset: auto 5cqw 5cqw 5cqw;
outline-width: 0;

@include breakpoint-up("sm") {
width: 42.5cqw;
max-width: 600px;
inset: auto auto 0 12.5cqw;
inset: auto auto 10cqw 12.5cqw;
}

img {
Expand Down
4 changes: 2 additions & 2 deletions src/layouts/Layout.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ const currentPage = data.collection?.items[0];
))
}
</head>
<body>
<body class:list={[isHome && "home"]}>
<Header />
<slot name="after-header" />
<main class:list={[isHome && "home"]}>
<main>
{
isHome ? (
<slot />
Expand Down
44 changes: 7 additions & 37 deletions src/pages/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import Layout from "../layouts/Layout.astro";
import VenueTeaser from "../components/VenueTeaser.astro";
import SponsorList from "../components/SponsorList.astro";
import Ticket from "../components/Ticket.astro";
import introDesktop from "../assets/intro/introDesktop.svg?raw";
import introMobile from "../assets/intro/introMobile.svg?raw";
import SpeakerList from "../components/SpeakerList.astro";
import Spline from "../components/Spline.astro";

const query = graphql(`
query {
Expand All @@ -33,11 +32,8 @@ const page = data.collection?.items[0];
page.showIntro && (
<>
<div class="introWrapper">
<div class="intro intro--desktop">
<Fragment set:html={introDesktop} class="introDesktop" />
</div>
<div class="intro intro--mobile">
<Fragment set:html={introMobile} class="introMobile" />
<div class="intro">
<Spline />
</div>
<Ticket />
</div>
Expand Down Expand Up @@ -115,41 +111,15 @@ const page = data.collection?.items[0];

.introWrapper {
position: relative;
max-width: calc(var(--max-content-width) + 10%);
margin-block-start: var(--spacing-6x);
max-width: calc(var(--max-content-width) + 30%);
margin-block-start: pxToRem(-80);
margin-inline: auto;
container-type: inline-size;

@include breakpoint-up("sm") {
padding-inline: var(--grid-padding);
}

@include breakpoint-up("lg") {
margin-block-start: var(--spacing-8x);
}
}

.intro {
display: none;

:global(svg) {
width: 100%;
height: auto;
}

&.intro--mobile {
display: block;
}

@include breakpoint-up("sm") {
&.intro--mobile {
display: none;
}

&.intro--desktop {
display: block;
}
}
position: relative;
z-index: -1;
}

.arrowWrapper {
Expand Down
18 changes: 9 additions & 9 deletions src/styles/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
@import "./_imports.scss";

body {
background: var(--color-black);
margin: 0;
}
background: var(--color-black);
margin: 0;

* {
box-sizing: border-box;
&:not(.home) {
background-color: var(--color-white);
color: var(--color-black);
}
}

main:not(.home) {
background-color: var(--color-white);
color: var(--color-black);
* {
box-sizing: border-box;
}

a,
button {
outline-offset: 4px;
outline-offset: 4px;
}