From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 14 Mar 2023 11:16:37 +0000 (+0000)
Subject: CSS: Move src/scss to src/sass
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b95d044e62a8f97cc0d0bdf68bed699a49fccccd;p=ipfire.org.git

CSS: Move src/scss to src/sass

Since we are now using SASS, this makes more sense.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/.gitignore b/.gitignore
index 08623db7..9a3d4644 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 /build-aux
 /configure
 /config.*
-/src/scss/*.css
+/src/sass/*.css
 /src/scripts/ipfire.org
 /src/scripts/ipfire.org-webapp
 /src/static/favicon.ico
diff --git a/Makefile.am b/Makefile.am
index 1cd854aa..1c685cd4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -339,15 +339,15 @@ templates_wiki_modulesdir = $(templates_wikidir)/modules
 
 # ------------------------------------------------------------------------------
 
-SCSS_FILES = \
-	src/scss/main.sass \
-	src/scss/_code-highlighting.scss \
-	src/scss/_fonts.scss \
-	src/scss/_icons.scss \
-	src/scss/_variables.scss
+SASS_FILES = \
+	src/sass/main.sass \
+	src/sass/_code-highlighting.scss \
+	src/sass/_fonts.scss \
+	src/sass/_icons.scss \
+	src/sass/_variables.scss
 
 EXTRA_DIST += \
-	src/scss/listing.scss \
+	src/sass/listing.scss \
 	src/templates/messages/main.scss
 
 CLEANFILES += \
@@ -356,17 +356,17 @@ CLEANFILES += \
 static_DATA = \
 	src/static/favicon.ico \
 	src/static/robots.txt \
-	src/scss/fonts.css \
-	src/scss/listing.css \
-	src/scss/main.css
+	src/sass/fonts.css \
+	src/sass/listing.css \
+	src/sass/main.css
 
 CLEANFILES += \
-	src/scss/fonts.css \
-	src/scss/listing.css \
-	src/scss/main.css
+	src/sass/fonts.css \
+	src/sass/listing.css \
+	src/sass/main.css
 
 EXTRA_DIST += \
-	$(SCSS_FILES)
+	$(SASS_FILES)
 
 staticdir = $(datadir)/static
 
@@ -1061,7 +1061,7 @@ SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 		$(SASSC) --style compressed $< > $@
 
-src/scss/main.css: $(SCSS_FILES) Makefile
+src/sass/main.css: $(SASS_FILES) Makefile
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 		$(SASSC) --style compressed $< > $@
 
diff --git a/src/scss/_code-highlighting.scss b/src/sass/_code-highlighting.scss
similarity index 100%
rename from src/scss/_code-highlighting.scss
rename to src/sass/_code-highlighting.scss
diff --git a/src/scss/_fonts.scss b/src/sass/_fonts.scss
similarity index 100%
rename from src/scss/_fonts.scss
rename to src/sass/_fonts.scss
diff --git a/src/scss/_icons.scss b/src/sass/_icons.scss
similarity index 100%
rename from src/scss/_icons.scss
rename to src/sass/_icons.scss
diff --git a/src/scss/_variables.scss b/src/sass/_variables.scss
similarity index 100%
rename from src/scss/_variables.scss
rename to src/sass/_variables.scss
diff --git a/src/scss/listing.scss b/src/sass/listing.scss
similarity index 100%
rename from src/scss/listing.scss
rename to src/sass/listing.scss
diff --git a/src/scss/main.sass b/src/sass/main.sass
similarity index 100%
rename from src/scss/main.sass
rename to src/sass/main.sass