Skip to content

Commit 7d00210

Browse files
authored
Merge pull request #27 from rustnl/update-deps
update deps
2 parents e8db322 + 94ad331 commit 7d00210

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2331
-2250
lines changed

astro.config.mjs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
import { defineConfig } from 'astro/config';
22

33
// https://astro.build/config
4-
export default defineConfig({});
4+
export default defineConfig({
5+
vite: {
6+
css: {
7+
preprocessorOptions: {
8+
scss: {
9+
api: "modern-compiler"
10+
}
11+
}
12+
}
13+
}
14+
});

public/images/people/jonathan.png

-787 KB
Binary file not shown.

src/2024-pages/boat.astro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ import Timetable from "../components/timetable/timetable.astro";
122122
</CommonLayout>
123123

124124
<style lang="scss">
125-
@import "../styles/variables.scss";
125+
@use "../styles/variables.scss";
126126

127127
.boat-description {
128-
font-size: $font-size-lg;
128+
font-size: variables.$font-size-lg;
129129

130130
h2 {
131-
font-size: $font-size-xl;
131+
font-size: variables.$font-size-xl;
132132
}
133133
}
134134
</style>

src/2024-pages/industry.astro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,9 @@ import ButtonGroup from "../components/ButtonGroup.astro";
257257
>
258258

259259
<style lang="scss">
260-
@import "../styles/variables.scss";
260+
@use "../styles/variables.scss";
261261

262262
.venue {
263-
font-size: $font-size-lg;
263+
font-size: variables.$font-size-lg;
264264
}
265265
</style>

src/2024-pages/live.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import CommonLayout from "../layouts/CommonLayout.astro";
2828
</CommonLayout>
2929

3030
<style lang="scss">
31-
@import "../styles/variables.scss";
31+
@use "../styles/variables.scss";
3232

3333
h2 {
3434
font-size: font-size-2xl;

src/2024-pages/workshops.astro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,8 @@ import CommonLayout from "../layouts/CommonLayout.astro";
297297
</CommonLayout>
298298

299299
<style lang="scss">
300-
@import "../styles/variables.scss";
300+
@use "../styles/variables.scss";
301301
h4 {
302-
font-size: $font-size-lg;
302+
font-size: variables.$font-size-lg;
303303
}
304304
</style>

src/components/Button.astro

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
---
2-
import { string } from 'astro/zod';
3-
42
interface Props {
53
link: string;
64
ty?: "primary" | "secondary";
@@ -14,45 +12,45 @@ const { link, ty = "primary", inFooter = false, scale = 1 }: Props = Astro.props
1412

1513
<a
1614
class:list={["button", ty, inFooter ? "footer" : null]}
17-
style=`text-decoration: none;color:$color-neutral-400;`
1815
href={link}
1916
>
2017
<slot>{link}</slot>
2118
</a>
2219

2320
<style lang="scss" is:global define:vars={{ scale }}>
24-
@import "../styles/variables.scss";
21+
@use "../styles/variables.scss";
2522

2623
.button {
24+
color: variables.$color-neutral-400;
25+
2726
align-items: center;
28-
border-radius: space(1);
27+
border-radius: variables.space(1);
2928
border: 1px solid transparent;
3029
cursor: pointer;
3130
display: inline-flex;
32-
font-size: calc(var(--scale) * $font-size-md);
31+
font-size: calc(var(--scale) * variables.$font-size-md);
3332
font-weight: 700;
34-
// min-height: calc(var(--scale) * space(12));
35-
padding: calc(var(--scale) * space(3)) calc(var(--scale) * space(6));
33+
padding: calc(var(--scale) * variables.space(3)) calc(var(--scale) * variables.space(6));
3634
text-align: center;
3735
text-decoration: none;
3836
user-select: none;
3937

4038
&.primary {
41-
background-color: $color-red-400;
42-
color: $color-neutral-400;
39+
background-color: variables.$color-red-400;
40+
color: variables.$color-neutral-400;
4341
}
4442

4543
&.secondary {
46-
border: 1px solid $color-red-400;
47-
color: $color-red-400;
44+
border: 1px solid variables.$color-red-400;
45+
color: variables.$color-red-400;
4846
}
4947

5048
&.footer {
5149
all: unset;
5250

5351
text-decoration: underline !important;
5452
cursor: pointer;
55-
color: $color-neutral-400;
53+
color: variables.$color-neutral-400;
5654
}
5755
}
5856
</style>

src/components/ButtonGroup.astro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
</div>
88

99
<style lang="scss">
10-
@import "../styles/variables.scss";
10+
@use "../styles/variables.scss";
1111

1212
.button-group {
1313
display: flex;
1414
flex-wrap: wrap;
15-
gap: space(3);
15+
gap: variables.space(3);
1616
justify-content: center;
1717
}
1818

src/components/DefaultSection.astro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ const { header }: Props = Astro.props;
1818
</section>
1919

2020
<style lang="scss">
21-
@import "../styles/variables.scss";
21+
@use "../styles/variables.scss";
2222

2323
.text {
24-
font-size: $font-size-lg;
24+
font-size: variables.$font-size-lg;
2525
}
2626
</style>

src/components/Divider.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88

99
<style lang="scss">
10-
@import "../styles/variables.scss";
10+
@use "../styles/variables.scss";
1111

1212
.container {
1313
width: 100%;

0 commit comments

Comments
 (0)