summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile15
-rw-r--r--static/about/index.html (renamed from html/about/index.html)0
-rw-r--r--static/assets/img/chakra.png (renamed from img/chakra.png)bin23611 -> 23611 bytes
-rw-r--r--static/assets/img/chakra.xcf (renamed from img/chakra.xcf)bin39039 -> 39039 bytes
-rw-r--r--static/assets/img/logo.png (renamed from img/logo.png)bin17290 -> 17290 bytes
-rw-r--r--static/contact/index.html (renamed from html/contact/index.html)0
-rw-r--r--static/includes/body-close.html (renamed from html/includes/body-close.html)0
-rw-r--r--static/includes/body-open.html (renamed from html/includes/body-open.html)0
-rw-r--r--static/includes/footer.html (renamed from html/includes/footer.html)0
-rw-r--r--static/includes/header-close.html (renamed from html/includes/header-close.html)0
-rw-r--r--static/includes/header-open.html (renamed from html/includes/header-open.html)0
-rw-r--r--static/includes/html-close.html (renamed from html/includes/html-close.html)0
-rw-r--r--static/includes/html-open.html (renamed from html/includes/html-open.html)0
-rw-r--r--static/includes/js.html (renamed from html/includes/js.html)0
-rw-r--r--static/includes/navbar.html (renamed from html/includes/navbar.html)0
-rw-r--r--static/index.html (renamed from html/index.html)0
-rw-r--r--static/join/index.html (renamed from html/join/index.html)0
-rw-r--r--static/volunteer/index.html (renamed from html/volunteer/index.html)0
18 files changed, 7 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index eb8c5ad..255d0b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,30 @@
BUILD_DIR=_build
CSS_DIR=$(BUILD_DIR)/assets/css
JS_DIR=$(BUILD_DIR)/assets/js
-IMG_DIR=$(BUILD_DIR)/assets/img
SCSS=scss/_all.scss
CSS=$(CSS_DIR)/fsfi.css
JS_SRC=js/navbar.js
-site: $(BUILD_DIR) css img html js
+site: $(BUILD_DIR) css static js
.PHONY: site
-html: $(BUILD_DIR)
- rsync -a html/ $(BUILD_DIR)/
-.PHONY: html
+static: $(BUILD_DIR)
+ rsync -a static/ $(BUILD_DIR)/
+.PHONY: static
-img: $(BUILD_DIR)
- rsync -a img/ $(IMG_DIR)/
-.PHONY: img
news:
@python3 ./bin/news
.PHONY: news
+
css: $(CSS)
.PHONY: css
+
$(CSS): $(SCSS) scss/style.scss $(BUILD_DIR)
mkdir -p `dirname $(CSS)`
sass --style expanded $(SCSS) $(CSS)
@@ -36,6 +34,7 @@ js: $(JS_DIR) $(JS_SRC)
cat $(JS_SRC) > $(JS_DIR)/fsfi.js
.PHONY: js
+
$(JS_DIR):
mkdir -p $(JS_DIR)
diff --git a/html/about/index.html b/static/about/index.html
index 92e1019..92e1019 100644
--- a/html/about/index.html
+++ b/static/about/index.html
diff --git a/img/chakra.png b/static/assets/img/chakra.png
index 42542eb..42542eb 100644
--- a/img/chakra.png
+++ b/static/assets/img/chakra.png
Binary files differ
diff --git a/img/chakra.xcf b/static/assets/img/chakra.xcf
index 3222c5e..3222c5e 100644
--- a/img/chakra.xcf
+++ b/static/assets/img/chakra.xcf
Binary files differ
diff --git a/img/logo.png b/static/assets/img/logo.png
index 3a69f73..3a69f73 100644
--- a/img/logo.png
+++ b/static/assets/img/logo.png
Binary files differ
diff --git a/html/contact/index.html b/static/contact/index.html
index 44998f4..44998f4 100644
--- a/html/contact/index.html
+++ b/static/contact/index.html
diff --git a/html/includes/body-close.html b/static/includes/body-close.html
index a446d53..a446d53 100644
--- a/html/includes/body-close.html
+++ b/static/includes/body-close.html
diff --git a/html/includes/body-open.html b/static/includes/body-open.html
index 335eec5..335eec5 100644
--- a/html/includes/body-open.html
+++ b/static/includes/body-open.html
diff --git a/html/includes/footer.html b/static/includes/footer.html
index f9c01ad..f9c01ad 100644
--- a/html/includes/footer.html
+++ b/static/includes/footer.html
diff --git a/html/includes/header-close.html b/static/includes/header-close.html
index fd78248..fd78248 100644
--- a/html/includes/header-close.html
+++ b/static/includes/header-close.html
diff --git a/html/includes/header-open.html b/static/includes/header-open.html
index 067edce..067edce 100644
--- a/html/includes/header-open.html
+++ b/static/includes/header-open.html
diff --git a/html/includes/html-close.html b/static/includes/html-close.html
index 5f85cab..5f85cab 100644
--- a/html/includes/html-close.html
+++ b/static/includes/html-close.html
diff --git a/html/includes/html-open.html b/static/includes/html-open.html
index ce8fe85..ce8fe85 100644
--- a/html/includes/html-open.html
+++ b/static/includes/html-open.html
diff --git a/html/includes/js.html b/static/includes/js.html
index 2cbc2e7..2cbc2e7 100644
--- a/html/includes/js.html
+++ b/static/includes/js.html
diff --git a/html/includes/navbar.html b/static/includes/navbar.html
index 7bd7102..7bd7102 100644
--- a/html/includes/navbar.html
+++ b/static/includes/navbar.html
diff --git a/html/index.html b/static/index.html
index 6a01061..6a01061 100644
--- a/html/index.html
+++ b/static/index.html
diff --git a/html/join/index.html b/static/join/index.html
index 9a73ca4..9a73ca4 100644
--- a/html/join/index.html
+++ b/static/join/index.html
diff --git a/html/volunteer/index.html b/static/volunteer/index.html
index d9657c4..d9657c4 100644
--- a/html/volunteer/index.html
+++ b/static/volunteer/index.html