Skip to content

Commit

Permalink
Merge pull request #7 from GDYUClub/netflify_new
Browse files Browse the repository at this point in the history
Netflify new
  • Loading branch information
JUB-Yoush authored Apr 23, 2024
2 parents 843046f + 35cee09 commit 70126c5
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 26 deletions.
8 changes: 4 additions & 4 deletions src/routes/about.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<div class="flex">
<div class="flex flex-col w-1/12">

</div>

<div class="w-10/12">
Expand All @@ -24,7 +24,7 @@
<p class="mt-10">
GDYU began as a small Discord server. Without proper registration, Brooks promoted GDYU as an “unofficial club”. People began showing up— enough for GDYU to apply as a real club, and in January 2022, our application was approved, and GDYU entered the big leagues!
</p>

<div class="aboutImg mt-10 xl:w-3/5"></div>
</div>

Expand All @@ -45,12 +45,12 @@
<style>
.aboutImg {
aspect-ratio: 2/1;
background: url('assets/GDYU_tabling_fall_2023.png');
background: url('/assets/GDYU_tabling_fall_2023.png');
background-color: #F5D33D;
background-position: 50% 50%;
background-size: 110%;
border-left: 1.5vw solid #F5D33D;
border-radius: 10px;
}
</style>
6 changes: 3 additions & 3 deletions src/routes/hero.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="pinkTextSmallerHero">ART</div>
</div>
</div>

<div class="flex lg:w-10/12 w-4/12">
<video
class="video m-auto"
Expand Down Expand Up @@ -53,7 +53,7 @@
height: 50%;
mask-size: 150%;
mask-position: 50% 50%;
mask-image: url('assets/logo-invert.svg');
mask-image: url('/assets/logo-invert.svg');
}
</style>
10 changes: 5 additions & 5 deletions src/routes/programs.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<div class="flex">
<div class="flex flex-col w-1/12">

</div>

<div class="w-10/12">
Expand Down Expand Up @@ -88,22 +88,22 @@
}
.eventCard .A {
background: url('assets/GDYU_blender_workshop.png');
background: url('/assets/GDYU_blender_workshop.png');
background-position: 50% 90%;
background-size: 100%;
}
.eventCard .B {
background: url('assets/GDYU_monthly_event.png');
background: url('/assets/GDYU_monthly_event.png');
background-position: 50% 0%;
background-size: 100%;
}
.eventCard .C {
background: url('assets/GDYU_talk_about_games.png');
background: url('/assets/GDYU_talk_about_games.png');
background-position: 70% 0%;
background-repeat: no-repeat;
background-size: 125% 147%;
}
</style>
4 changes: 2 additions & 2 deletions src/routes/zine/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
}
.flashHero {
height: 600px;
background-image: url('assets/flash.svg');
background-image: url('/assets/flash.svg');
background-position: center center;
background-repeat: no-repeat;
background-size: contain;
Expand All @@ -69,7 +69,7 @@
line-height: calc(10px + 1vw);
}
.flashApply {
background-image: url('assets/pocket_shib.png');
background-image: url('/assets/pocket_shib.png');
background-position: 50% 70%;
background-repeat: no-repeat;
background-size: 110%;
Expand Down
13 changes: 2 additions & 11 deletions svelte.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
import adapter from '@sveltejs/adapter-static';
import adapter from '@sveltejs/adapter-auto';
import {mdsvex} from 'mdsvex'
import sveltePreprocess from 'svelte-preprocess';

Expand All @@ -9,16 +9,7 @@ const config = {
// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
// If your environment is not supported or you settled on a specific environment, switch out the adapter.
// See https://kit.svelte.dev/docs/adapters for more information about adapters.
adapter: adapter({
pages:'build',
assets:'build',
fallback: 'app.html',
precompress: false,
strict:true
}),
paths: {
base: process.argv.includes('dev') ? '' : process.env.BASE_PATH
}
adapter: adapter(),
},
extensions:['.svelte','.md'],

Expand Down
2 changes: 1 addition & 1 deletion vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import { sveltekit } from '@sveltejs/kit/vite';
import { defineConfig } from 'vite';

export default defineConfig({
plugins: [sveltekit()]
plugins: [sveltekit()],
});

0 comments on commit 70126c5

Please sign in to comment.