From f1701957c30daae7cd133bec5a7968480563ce9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Weber?= Date: Thu, 19 Dec 2024 23:01:28 +0100 Subject: [PATCH] variant: fix import resolution for modified variants #974 --- layouts/partials/_relearn/themeVariants.gotmpl | 2 +- layouts/partials/version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/partials/_relearn/themeVariants.gotmpl b/layouts/partials/_relearn/themeVariants.gotmpl index 93669a3588..e92ee1233d 100644 --- a/layouts/partials/_relearn/themeVariants.gotmpl +++ b/layouts/partials/_relearn/themeVariants.gotmpl @@ -231,7 +231,7 @@ Generator run: {{- range findRESubmatch `[ \t]*@import\s+[^$]*?theme-([^.]*?)\.css` $themecontent }} {{- $subidentifier := index . 1 }} {{- $themevariant = partial "get-theme-details.html" (dict "themevariant" $themevariant "identifier" $subidentifier) }} - {{- $tempthemecontent = replaceRE (printf `[ \t]*@import\s+[^$]*?theme-%s\.css` $subidentifier) $themevariant.themecontent $tempthemecontent 1 }} + {{- $tempthemecontent = replaceRE (printf `[ \t]*@import\s+[^$]*?theme-%s\.css["']?\s*\)?\s*;?` $subidentifier) $themevariant.themecontent $tempthemecontent 1 }} {{- $chroma = $themevariant.chroma }} {{- $chromacontent = $themevariant.chromacontent }} {{- end }} diff --git a/layouts/partials/version.txt b/layouts/partials/version.txt index 2c9a2947af..0225b7a3eb 100644 --- a/layouts/partials/version.txt +++ b/layouts/partials/version.txt @@ -1 +1 @@ -7.2.1+16d4de84becfa2d2e6bdb2394a2f4fa411bc0007 \ No newline at end of file +7.2.1+66f4fbf5f04db1aa128d8f951c0883cc226312b9 \ No newline at end of file