added vendor to gitignore, fixed some absolute paths (for prod)

This commit is contained in:
Benjamin Jones 2020-03-26 19:45:15 +01:00
parent b8b59b7e18
commit 054bb01d47
9 changed files with 34 additions and 42 deletions

3
.gitignore vendored
View File

@ -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

15
.vscode/settings.json vendored Normal file
View File

@ -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"
}
}

View File

@ -3,20 +3,6 @@ permalink: /404.html
layout: default
---
<style type="text/css" media="screen">
.container {
margin: 10px auto;
max-width: 600px;
text-align: center;
}
h1 {
margin: 30px 0;
font-size: 4em;
line-height: 1;
letter-spacing: -1px;
}
</style>
<div class="container error-404">
<div class="fourohfour">
<h1>4</h1>
@ -26,9 +12,4 @@ layout: default
<p><strong>Page not found</strong></p>
<p>¯\_(ツ)_/¯</p>
<a href="/">return home</a>
<script>
const f404 = document.querySelectorAll('h1, strong, p')
f404.forEach(elem => elem.addEventListener('mouseover', () => elem.parentNode.removeChild(elem)))
</script>
</div>

View File

@ -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

View File

@ -6,12 +6,12 @@
<meta name="description" content="{{ page.excerpt | default: site.description | strip_html | normalize_whitespace | truncate: 160 | escape }}">
<meta name="author" content="{{ page.author }}">
<meta name="keywords" content="{{ page.keyword | strip_html | normalize_whitespace | escape }}">
<link rel="icon" type="image/png" sizes="32x32" href={{ "/assets/favicons/favicon-32x32.png" | absolute_url }}>
<link rel="icon" type="image/png" sizes="16x16" href={{ "/assets/favicons/favicon-16x16.png" | absolute_url }}>
<link rel="apple-touch-icon" sizes="180x180" href={{ "/assets/favicons/apple-touch-icon.png" | absolute_url }}>
<link rel="manifest" href={{ "/assets/favicons/site.webmanifest" | absolute_url }}>
<link rel="icon" type="image/png" sizes="32x32" href="{{ site.baseurl }}/assets/favicons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="{{ site.baseurl }}/assets/favicons/favicon-16x16.png">
<link rel="apple-touch-icon" sizes="180x180" href="{{ site.baseurl }}/assets/favicons/apple-touch-icon.png">
<link rel="manifest" href="{{ site.baseurl }}/assets/favicons/site.webmanifest">
<link rel="mask-icon" href={{ "/assets/favicons/safari-pinned-tab.svg" | absolute_url }} color="#5bbad5">
<link rel="mask-icon" href="{{ site.baseurl }}/assets/favicons/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="theme-color" content="#ffffff">
<meta content="{{ site.title }}" property="og:site_name" />
@ -62,16 +62,16 @@
{% else %}
<!-- OG data for homepage -->
<!-- <meta property="og:image" content="/assets/img/logo-xr.png" /> -->
<!-- <meta property="og:image" content="{{ site.baseurl }}/assets/img/logo-xr.png" /> -->
<meta property="og:type" content="website" />
<meta name="twitter:card" content="summary" />
<meta name="twitter:title" content="{{site.title}}" />
<!-- <meta name="twitter:image" content="{{site.baseurl}} /assets/img/logo-xr.png" /> -->
<!-- <meta name="twitter:image" content="{{site.baseurl}} {{ site.baseurl }}/assets/img/logo-xr.png" /> -->
{% endif %}
<!-- Theme CSS -->
<!-- <link href="assets/css/index.css?{{site.time | date: '%Y%m%d%H%M%S'}}" rel="stylesheet"> -->
<link href={{ "/assets/css/index.css" | absolute_url }} rel="stylesheet">
<link href="{{ site.baseurl }}/assets/css/index.css" rel="stylesheet">
</head>

View File

@ -1,5 +1,5 @@
{% if page.lang == 'en' %}
<a href="/{{ site.baseurl }}/fr" class="lang lang--{{ page.lang }}">{{ include.fr-text }}</a>
<a href="{{ site.baseurl }}/fr" class="lang lang--{{ page.lang }}">{{ include.fr-text }}</a>
{% else %}
<a href="/{{ site.baseurl }}/" class="lang lang--{{ page.lang }}">{{ include.en-text }} </a>
<a href="{{ site.baseurl }}/" class="lang lang--{{ page.lang }}">{{ include.en-text }} </a>
{% endif %}

View File

@ -5,5 +5,5 @@
{{ content }}
{% include common/footer.html %}
</body>
<script src={{ "/assets/js/index.js" | absolute_url }}></script>
<script src="{{ site.baseurl }}/assets/js/index.js" }}></script>
</html>

View File

@ -16,7 +16,7 @@ layout: page
</div>
<span class="side-title side-title--left hidden">
ReclaimFutures 2019
ReclaimFutures 2020
</span>
<span class="side-title side-title--right hidden">

View File

@ -10,7 +10,7 @@
p,
a,
strong {
color: $white;
color: $black;
}
.fourohfour {
@ -31,10 +31,6 @@
a {
transition: transform 5s ease-in-out;
&:hover {
transform: scale(20) rotate(360deg);
}
}
}