From d0737aa699cc1a70b765dd26c9dc3942872b66d4 Mon Sep 17 00:00:00 2001 From: Sam Hadow Date: Tue, 16 Dec 2025 18:07:02 +0100 Subject: [PATCH] replace deprecated Sass @import rules with @use --- .gitignore | 2 ++ _sass/jekyll-theme-minimalist.scss | 6 +++--- _sass/minimalist.scss | 5 +---- assets/css/colors-auto-default-dark.scss | 10 +++++----- assets/css/colors-auto.scss | 10 +++++----- assets/css/colors-dark.scss | 10 +++++----- assets/css/colors-light.scss | 8 ++++---- assets/css/style-article.scss | 2 +- assets/css/style.scss | 2 +- 9 files changed, 27 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index e683b68..2d8cc20 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ Gemfile.lock *.backup *.kate-swp *.pdf +log/ +tmp/ diff --git a/_sass/jekyll-theme-minimalist.scss b/_sass/jekyll-theme-minimalist.scss index 2edef22..6714930 100644 --- a/_sass/jekyll-theme-minimalist.scss +++ b/_sass/jekyll-theme-minimalist.scss @@ -1,6 +1,6 @@ -@import "fonts"; -@import "rouge-github"; -@import "colors"; +@use "fonts"; +@use "rouge-github"; +@use "colors"; // default variables $section-width: 75% !default; diff --git a/_sass/minimalist.scss b/_sass/minimalist.scss index 9fbc2f6..1231cbc 100644 --- a/_sass/minimalist.scss +++ b/_sass/minimalist.scss @@ -1,4 +1 @@ -// Placeholder file. If your site uses -// @import "{{ site.theme }}"; -// Then using this theme with jekyll-remote-theme will work fine. -@import "jekyll-theme-minimalist"; \ No newline at end of file +@use "jekyll-theme-minimalist"; diff --git a/assets/css/colors-auto-default-dark.scss b/assets/css/colors-auto-default-dark.scss index 5bafdb1..b52c484 100644 --- a/assets/css/colors-auto-default-dark.scss +++ b/assets/css/colors-auto-default-dark.scss @@ -3,15 +3,15 @@ //this mode is like colors-auto but if the device does not support @media prefers-color-scheme it will deafault to dark mode -@import "colors"; +@use "colors" as c; :root { - @include colors; - @include dark-colors; + @include c.colors; + @include c.dark-colors; } @media print, (prefers-color-scheme: light) {//we would not like to apply dark mode if content is on printer as that would use a lot of ink :root { - @include light-colors; + @include c.light-colors; } -} \ No newline at end of file +} diff --git a/assets/css/colors-auto.scss b/assets/css/colors-auto.scss index d9a2a19..f70ab24 100644 --- a/assets/css/colors-auto.scss +++ b/assets/css/colors-auto.scss @@ -1,15 +1,15 @@ --- --- -@import "colors"; +@use "colors" as c; :root { - @include colors; - @include light-colors; + @include c.colors; + @include c.light-colors; } @media screen and (prefers-color-scheme: dark) {//we would not like to apply dark mode if content is on printer as that would use a lot of ink :root{ - @include dark-colors; + @include c.dark-colors; } -} \ No newline at end of file +} diff --git a/assets/css/colors-dark.scss b/assets/css/colors-dark.scss index e567564..a03794c 100644 --- a/assets/css/colors-dark.scss +++ b/assets/css/colors-dark.scss @@ -1,15 +1,15 @@ --- --- -@import "colors"; +@use "colors" as c; :root { - @include colors; - @include dark-colors; + @include c.colors; + @include c.dark-colors; } @media print { :root { - @include light-colors; + @include c.light-colors; } -} \ No newline at end of file +} diff --git a/assets/css/colors-light.scss b/assets/css/colors-light.scss index bccbf3d..221bb26 100644 --- a/assets/css/colors-light.scss +++ b/assets/css/colors-light.scss @@ -1,9 +1,9 @@ --- --- -@import "colors"; +@use "colors" as c; :root { - @include colors; - @include light-colors; -} \ No newline at end of file + @include c.colors; + @include c.light-colors; +} diff --git a/assets/css/style-article.scss b/assets/css/style-article.scss index 8b6a943..d5dffae 100644 --- a/assets/css/style-article.scss +++ b/assets/css/style-article.scss @@ -4,7 +4,7 @@ $section-width: 100%; $section-float: middle; -@import "jekyll-theme-minimalist"; +@use "jekyll-theme-minimalist"; .img-circle { -webkit-border-radius: 8px; diff --git a/assets/css/style.scss b/assets/css/style.scss index 31f9a60..3d2d4d5 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -1,7 +1,7 @@ --- --- -@import "jekyll-theme-minimalist"; +@use "jekyll-theme-minimalist"; .img-circle { -webkit-border-radius: 8px;