Skip to content
Draft
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
8 changes: 8 additions & 0 deletions astro.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ export default defineConfig({
rollupOptions: {
external: ["/src/scripts/*"],
},
css: {
preprocessorOptions: {
scss: {
//Break build on @import. We use @use instead. See #1309
fatalDeprecations: ['import'],
},
},
},
},
image: {
domains: ["openprocessing.org"],
Expand Down
14 changes: 7 additions & 7 deletions src/components/Dropdown/styles.module.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "/styles/variables.scss";
@use "styles/variables.scss";

.container {
position: relative;
Expand Down Expand Up @@ -62,11 +62,11 @@
.icon {
left: 10px;
top: 8px;
@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
left: 11px;
top: 8px;
}
@media (min-width: $breakpoint-desktop) {
@media (min-width: variables.$breakpoint-desktop) {
left: 11px;
top: 10px;
}
Expand All @@ -76,7 +76,7 @@
left: 10px;
top: 8px;

@media (min-width: $breakpoint-laptop) {
@media (min-width: variables.$breakpoint-laptop) {
left: 11px;
top: 10px;
}
Expand All @@ -85,11 +85,11 @@
.chevron {
right: 10px;
top: 12px;
@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
right: 12px;
top: 14px;
}
@media (min-width: $breakpoint-desktop) {
@media (min-width: variables.$breakpoint-desktop) {
right: 12px;
top: 16px;
}
Expand Down Expand Up @@ -125,7 +125,7 @@ button.chevron {
// 0.75rem font-size for mobile to fit content in smaller screens
font-size: 0.75rem;

@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
font-size: 1rem;
padding-right: 10px;
}
Expand Down
22 changes: 11 additions & 11 deletions src/components/Nav/styles.module.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@import "/styles/variables.scss";
@import "/styles/global.scss";
@use "styles/variables.scss";
@use "styles/global.scss";

.container {
height: fit-content;

@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
position: fixed;
border-right-width: 1px;
border-color: var(--sidebar-type-color);
Expand Down Expand Up @@ -49,7 +49,7 @@
margin-bottom: var(--spacing-xs);
}

@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
display: grid;
grid-auto-flow: column;
grid-template-columns: 1fr;
Expand Down Expand Up @@ -104,14 +104,14 @@
height: 1rem;
width: 1.25rem;
}
@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
display: none !important;
}
}

.desktopMenuLabel {
display: none;
@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
display: block;
margin-top: 7.5px;
}
Expand All @@ -122,7 +122,7 @@
display: flex;
}
.desktopMenuLabel {
@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
display: none;
}
}
Expand Down Expand Up @@ -175,7 +175,7 @@
padding: var(--spacing-xs) 1.25rem;
}

@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
height: fit-content;
border-top-width: 1px;
margin-top: auto;
Expand Down Expand Up @@ -217,7 +217,7 @@
line-height: 1.167;
-webkit-text-stroke-width: 0.15px;

@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
font-size: 1.25rem;
line-height: 1.2;
-webkit-text-stroke-width: 0.15px;
Expand All @@ -244,7 +244,7 @@
-webkit-text-stroke-width: 0.05px;
}

@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
&:global(.small) {
// text-body-caption
font-size: 0.875rem;
Expand All @@ -270,7 +270,7 @@
flex-grow: 1;
height: unset;

@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
height: 100%;
overflow-y: scroll;

Expand Down
24 changes: 12 additions & 12 deletions src/components/Settings/styles.module.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@import "/styles/variables.scss";
@use "styles/variables.scss";

.container {
position: relative;
@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
margin-top: 0;
}
}
Expand All @@ -19,18 +19,18 @@
row-gap: 20px;
column-gap: 40px;

@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
width: calc(100% - var(--nav-offset-x));
padding: 1.25rem var(--spacing-lg) var(--spacing-sm);
}

@media (min-width: $breakpoint-laptop) {
@media (min-width: variables.$breakpoint-laptop) {
grid-template-columns: repeat(9, minmax(0, 1fr));
gap: 40px;
grid-template-rows: var(--settings-container-height-laptop);
}

@media (min-width: $breakpoint-desktop) {
@media (min-width: variables.$breakpoint-desktop) {
grid-template-columns: repeat(12, minmax(0, 1fr));
}
}
Expand All @@ -44,10 +44,10 @@
.localeselect,
.a11yselect {
grid-column: span 3;
@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
grid-column: span 3;
}
@media (min-width: $breakpoint-laptop) {
@media (min-width: variables.$breakpoint-laptop) {
grid-column: span 3;
}
}
Expand All @@ -56,16 +56,16 @@
grid-column: span 6;
grid-row: 1;

@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
grid-column: span 6;
}

@media (min-width: $breakpoint-laptop) {
@media (min-width: variables.$breakpoint-laptop) {
grid-row: unset;
grid-column: span 3;
}

@media (min-width: $breakpoint-desktop) {
@media (min-width: variables.$breakpoint-desktop) {
grid-column: span 6;
}
}
Expand Down Expand Up @@ -96,14 +96,14 @@

.container:global(.noJumpTo) .wrapper:global(.open) {
top: 40px;
@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
top: 0px;
}
}

.wrapper:global(.open) {
top: 80px;
@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
top: 0px;
}
}
4 changes: 2 additions & 2 deletions src/layouts/HomepageLayout.astro
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ setJumpToState(null);
</BaseLayout>

<style lang="scss">
@import "../../styles/variables.scss";
@use "styles/variables.scss";
h2 {
@apply mb-sm mt-0;
@media (min-width: $breakpoint-tablet) {
@media (min-width: variables.$breakpoint-tablet) {
font-size: 3.5rem;
}
}
Expand Down
8 changes: 4 additions & 4 deletions styles/base.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "./variables.scss";
@import "./global.scss";
@import "./code-editor.scss";
@import "./markdown.scss";
@use "variables.scss";
@use "global.scss";
@use "code-editor.scss";
@use "markdown.scss";
Loading
Loading