From 054bb01d474f7e5ab5713279de8d52078b9b8115 Mon Sep 17 00:00:00 2001 From: Benjamin Jones Date: Thu, 26 Mar 2020 19:45:15 +0100 Subject: [PATCH] added vendor to gitignore, fixed some absolute paths (for prod) --- .gitignore | 3 ++- .vscode/settings.json | 15 +++++++++++++++ 404.html | 19 ------------------- _config.yml | 9 ++++----- _includes/common/head.html | 16 ++++++++-------- _includes/common/lang-selector.html | 4 ++-- _layouts/default.html | 2 +- _layouts/page-with-header.html | 2 +- _sass/layouts/404.scss | 6 +----- 9 files changed, 34 insertions(+), 42 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 07234a7..db07e39 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ _site .sass-cache/ .jekyll-cache/ .jekyll-metadata +vendor ### Linux ### *~ @@ -43,7 +44,7 @@ Icon .Trashes ehthumbs.db Thumbs.db -.vscode +# .vscode .VolumeIcon.icns .com.apple.timemachine.donotpresent diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..a8219b4 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,15 @@ +{ + "editor.formatOnSave": false, + "[scss]": { + "editor.formatOnSave": true + }, + "[yml]": { + "editor.formatOnSave": true + }, + "workbench.colorCustomizations": { + "titleBar.activeBackground": "#20232e", + "titleBar.inactiveForeground": "#3cafb3", + "titleBar.activeForeground": "#0ac2c9", + "titleBar.inactiveBackground": "#20232e" + } +} diff --git a/404.html b/404.html index d11bede..18e210f 100644 --- a/404.html +++ b/404.html @@ -3,20 +3,6 @@ permalink: /404.html layout: default --- - -

4

@@ -26,9 +12,4 @@ layout: default

Page not found

¯\_(ツ)_/¯

return home -
diff --git a/_config.yml b/_config.yml index d40270e..0914749 100644 --- a/_config.yml +++ b/_config.yml @@ -19,15 +19,14 @@ # in the templates via {{ site.myvariable }}. title: ReclaimFutures -email: your-email@example.com +email: info@reclaimfutures.org description: >- # this means to ignore newlines until "baseurl:" - ReclaimFutures is a technology and culture conference around the broad subjects of post-capitalist desire, utopian exploration and the real sustainable computing. + ReclaimFutures is a technology and culture conference exploring post-capitalist desire, utopian horizons, alternative computing and ecology.. baseurl: "" # the subpath of your site, e.g. /blog -url: "https://reclaimfutures.org" # the base hostname & protocol for your site, e.g. http://example.com -twitter_username: jekyllrb -github_username: jekyll +url: "" # the base hostname & protocol for your site, e.g. http://example.com # Build settings + theme: minima plugins: - jekyll-feed diff --git a/_includes/common/head.html b/_includes/common/head.html index 6b9148e..12a5184 100644 --- a/_includes/common/head.html +++ b/_includes/common/head.html @@ -6,12 +6,12 @@ - - - - + + + + - + @@ -62,16 +62,16 @@ {% else %} - + - + {% endif %} - + \ No newline at end of file diff --git a/_includes/common/lang-selector.html b/_includes/common/lang-selector.html index 04bd6b8..ea4984d 100644 --- a/_includes/common/lang-selector.html +++ b/_includes/common/lang-selector.html @@ -1,5 +1,5 @@ {% if page.lang == 'en' %} - {{ include.fr-text }} + {{ include.fr-text }} {% else %} - {{ include.en-text }} + {{ include.en-text }} {% endif %} \ No newline at end of file diff --git a/_layouts/default.html b/_layouts/default.html index 123725f..ee136ac 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -5,5 +5,5 @@ {{ content }} {% include common/footer.html %} - + \ No newline at end of file diff --git a/_layouts/page-with-header.html b/_layouts/page-with-header.html index 45d7c4a..94a1565 100644 --- a/_layouts/page-with-header.html +++ b/_layouts/page-with-header.html @@ -16,7 +16,7 @@ layout: page