From edfb6c1601249be78097385c14c4efd93bfb03fc Mon Sep 17 00:00:00 2001 From: Wen Kokke Date: Wed, 14 Jul 2021 15:46:39 +0100 Subject: [PATCH] Fixed bug in agda.css; compile with SCSS compiler. --- css/minima.scss | 5 +++-- css/{minima => theme}/_base.scss | 0 css/{minima => theme}/_layout.scss | 0 css/{agda.css => theme/agda.scss} | 0 css/{minima => theme}/custom-styles.scss | 0 css/{minima => theme}/custom-variables.scss | 0 css/{minima => theme}/initialize.scss | 0 css/{minima => theme}/skins/classic.scss | 0 css/{minima => theme}/skins/dark.scss | 0 css/{minima => theme}/skins/solarized-dark.scss | 0 css/{minima => theme}/skins/solarized.scss | 0 hs/Main.hs | 2 +- standard-library | 2 +- 13 files changed, 5 insertions(+), 4 deletions(-) rename css/{minima => theme}/_base.scss (100%) rename css/{minima => theme}/_layout.scss (100%) rename css/{agda.css => theme/agda.scss} (100%) rename css/{minima => theme}/custom-styles.scss (100%) rename css/{minima => theme}/custom-variables.scss (100%) rename css/{minima => theme}/initialize.scss (100%) rename css/{minima => theme}/skins/classic.scss (100%) rename css/{minima => theme}/skins/dark.scss (100%) rename css/{minima => theme}/skins/solarized-dark.scss (100%) rename css/{minima => theme}/skins/solarized.scss (100%) diff --git a/css/minima.scss b/css/minima.scss index b5b5b84c..d26997a8 100644 --- a/css/minima.scss +++ b/css/minima.scss @@ -1,4 +1,5 @@ @import - "minima/skins/classic", - "minima/initialize" + "theme/skins/classic", + "theme/initialize", + "theme/agda" ; diff --git a/css/minima/_base.scss b/css/theme/_base.scss similarity index 100% rename from css/minima/_base.scss rename to css/theme/_base.scss diff --git a/css/minima/_layout.scss b/css/theme/_layout.scss similarity index 100% rename from css/minima/_layout.scss rename to css/theme/_layout.scss diff --git a/css/agda.css b/css/theme/agda.scss similarity index 100% rename from css/agda.css rename to css/theme/agda.scss diff --git a/css/minima/custom-styles.scss b/css/theme/custom-styles.scss similarity index 100% rename from css/minima/custom-styles.scss rename to css/theme/custom-styles.scss diff --git a/css/minima/custom-variables.scss b/css/theme/custom-variables.scss similarity index 100% rename from css/minima/custom-variables.scss rename to css/theme/custom-variables.scss diff --git a/css/minima/initialize.scss b/css/theme/initialize.scss similarity index 100% rename from css/minima/initialize.scss rename to css/theme/initialize.scss diff --git a/css/minima/skins/classic.scss b/css/theme/skins/classic.scss similarity index 100% rename from css/minima/skins/classic.scss rename to css/theme/skins/classic.scss diff --git a/css/minima/skins/dark.scss b/css/theme/skins/dark.scss similarity index 100% rename from css/minima/skins/dark.scss rename to css/theme/skins/dark.scss diff --git a/css/minima/skins/solarized-dark.scss b/css/theme/skins/solarized-dark.scss similarity index 100% rename from css/minima/skins/solarized-dark.scss rename to css/theme/skins/solarized-dark.scss diff --git a/css/minima/skins/solarized.scss b/css/theme/skins/solarized.scss similarity index 100% rename from css/minima/skins/solarized.scss rename to css/theme/skins/solarized.scss diff --git a/hs/Main.hs b/hs/Main.hs index ed3ad905..20b2345d 100644 --- a/hs/Main.hs +++ b/hs/Main.hs @@ -336,7 +336,7 @@ main = do -- Compile CSS match "css/*.css" $ compile compressCssCompiler - scss <- makePatternDependency "css/minima/**.scss" + scss <- makePatternDependency "css/theme/**.scss" rulesExtraDependencies [scss] $ match "css/minima.scss" $ compile $ sassCompilerWith sassOptions diff --git a/standard-library b/standard-library index 9f929b4f..2f0fb515 160000 --- a/standard-library +++ b/standard-library @@ -1 +1 @@ -Subproject commit 9f929b4fe28bb7ba74b6b95d01ed0958343f3451 +Subproject commit 2f0fb515271fa1a01a5c55b9cf5d401c5c65aa37