Rip out categories entirely, various bits of cleanup, and put all posts on the main page (for now).
This commit is contained in:
parent
5d6a616f45
commit
0fe4708ecf
|
|
@ -1,2 +1,8 @@
|
|||
FROM jekyll/jekyll as build
|
||||
|
||||
WORKDIR /src
|
||||
COPY . /src
|
||||
jekyll build
|
||||
|
||||
FROM nginx
|
||||
COPY _site /usr/share/nginx/html
|
||||
COPY --from=build /src/_site /usr/share/nginx/html
|
||||
|
|
|
|||
8
Makefile
8
Makefile
|
|
@ -1,9 +1,11 @@
|
|||
DOCKER_IMAGE := cr.annabunch.es/annabunches-static
|
||||
|
||||
all: site
|
||||
all: build
|
||||
|
||||
site:
|
||||
jekyll build
|
||||
serve:
|
||||
docker run --rm -it -p 4000:4000 -v $(shell pwd):/srv/jekyll jekyll/jekyll jekyll serve --drafts --future --safe -d /tmp/site --trace
|
||||
|
||||
build:
|
||||
docker build -t ${DOCKER_IMAGE} .
|
||||
|
||||
push:
|
||||
|
|
|
|||
22
_config.yml
22
_config.yml
|
|
@ -8,14 +8,13 @@
|
|||
# Site settings
|
||||
title: Anna and the Bunches
|
||||
email: annabunches@gmail.com
|
||||
description: > # this means to ignore newlines until "baseurl:"
|
||||
description: >
|
||||
The story of Anna and her lifelong friends, Left Bunch and Right Bunch.
|
||||
The power... the passion... the danger. Their courage will change the world.
|
||||
baseurl: "" # the subpath of your site, e.g. /blog
|
||||
url: "http://annabunch.es" # the base hostname & protocol for your site
|
||||
baseurl: ""
|
||||
url: "https://annabunch.es"
|
||||
twitter_username: annabunches
|
||||
github_username: annabunches
|
||||
exclude: ["_posts/**/*.asc"]
|
||||
|
||||
permalink: none
|
||||
timezone: America/New_York
|
||||
|
|
@ -23,21 +22,6 @@ timezone: America/New_York
|
|||
# Build settings
|
||||
markdown: kramdown
|
||||
|
||||
# Category settings
|
||||
category_metadata:
|
||||
technology:
|
||||
title: "The Technologist"
|
||||
description: This section of the blog is where I talk about technology. Tutorials, rants, and discussions about programming languages, operating systems, hardware, and more.
|
||||
main: true
|
||||
media:
|
||||
title: "The Player of Games"
|
||||
description: Here I talk about media. Video games, tabletop games, movies, TV.
|
||||
main: true
|
||||
religion:
|
||||
title: "The Mystic"
|
||||
description: Discussions of my adventures with faith, spirituality, truth, and magic. Lots of woo here.
|
||||
main: false
|
||||
|
||||
defaults:
|
||||
- scope:
|
||||
path: ""
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
- title: GPG Key
|
||||
url: https://keybase.io/annabunches/pgp_keys.asc?fingerprint=82b1fcf343081be8e78826cf2b856f73efef6022
|
||||
url: https://annabunch.es/public_key.asc
|
||||
|
||||
- title: Site Source
|
||||
url: http://github.com/annabunches/annabunch.es
|
||||
url: https://git.annabunch.es/annabunches/annabunch.es
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
<div class="category-menu">
|
||||
{% for category in site.category_metadata %}
|
||||
<span class="category-link">
|
||||
<a href="/{{category.first}}">
|
||||
{{ category.last["title"] }}
|
||||
</a>
|
||||
</span>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
|
@ -11,12 +11,6 @@
|
|||
|
||||
<div class="footer-col footer-col-2">
|
||||
<ul class="social-media-list">
|
||||
{% if site.github_username %}
|
||||
<li>
|
||||
{% include icon-github.html username=site.github_username %}
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{% if site.twitter_username %}
|
||||
<li>
|
||||
{% include icon-twitter.html username=site.twitter_username %}
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
<a href="https://github.com/{{ include.username }}"><span class="icon icon--github">{% include icon-github.svg %}</span><span class="username">{{ include.username }}</span></a>
|
||||
|
|
@ -1 +0,0 @@
|
|||
<svg viewBox="0 0 16 16"><path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/></svg>
|
||||
|
Before Width: | Height: | Size: 926 B |
|
|
@ -1,18 +1,16 @@
|
|||
<ul class="post-list">
|
||||
{% for post in site.posts limit:include.limit %}
|
||||
{% if include.categories contains post.category %}
|
||||
<li style="margin-top: 30px">
|
||||
<h2 style="line-height: 1">
|
||||
<a class="post-link" href="{{ post.url | prepend: site.baseurl }}">
|
||||
{{ post.title }}
|
||||
</a>
|
||||
<span class="post-meta">{{ post.date | date: "%Y-%m-%d" }}</span>
|
||||
</h2>
|
||||
{{ post.excerpt }}
|
||||
<p>
|
||||
<a href="{{ post.url | prepend: site.baseurl }}">Read More...</a>
|
||||
</p>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% for post in site.posts %}
|
||||
<li style="margin-top: 30px">
|
||||
<h2 style="line-height: 1">
|
||||
<a class="post-link" href="{{ post.url | prepend: site.baseurl }}">
|
||||
{{ post.title }}
|
||||
</a>
|
||||
<span class="post-meta">{{ post.date | date: "%Y-%m-%d" }}</span>
|
||||
</h2>
|
||||
{{ post.excerpt }}
|
||||
<p>
|
||||
<a href="{{ post.url | prepend: site.baseurl }}">Read More...</a>
|
||||
</p>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
<ul class="post-list">
|
||||
{% for post in site.posts limit:include.limit %}
|
||||
{% if post.main != false && (site.category_metadata[post.category][main] || post.main == true) %}
|
||||
<li style="margin-top: 30px">
|
||||
<h2 style="line-height: 1">
|
||||
<a class="post-link" href="{{ post.url | prepend: site.baseurl }}">
|
||||
{{ post.title }}
|
||||
</a>
|
||||
<span class="post-meta">{{ post.date | date: "%Y-%m-%d" }}</span>
|
||||
</h2>
|
||||
{{ post.excerpt }}
|
||||
<p>
|
||||
<a href="{{ post.url | prepend: site.baseurl }}">Read More...</a>
|
||||
</p>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
17
index.html
17
index.html
|
|
@ -2,8 +2,6 @@
|
|||
layout: default
|
||||
---
|
||||
<div class="home">
|
||||
{% include category_menu_top.html %}
|
||||
|
||||
{% assign last_meta = site.categories.meta.first %}
|
||||
{% if last_meta.active %}
|
||||
<div class="site-update">
|
||||
|
|
@ -14,18 +12,5 @@ layout: default
|
|||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% include post_list_main.html limit=10 %}
|
||||
|
||||
<p class="post-meta" style="margin-top: 40px">
|
||||
For more posts, choose a category:
|
||||
<ul>
|
||||
{% for category in site.category_metadata %}
|
||||
<li>
|
||||
<a href="{{category.first | prepend: site.baseurl}}">
|
||||
{{ category.last["title"]}}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</p>
|
||||
{% include post_list.html %}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ in_menu: true
|
|||
permalink: /about/
|
||||
---
|
||||
## About the Site
|
||||
Anna and the Bunches is a self-indulgent blog about technology, media, religion, and other things I have strong feelings about. I especially like writing about the intersections between things.
|
||||
Anna and the Bunches is a self-indulgent blog about the nerdy side of my life, which mostly means technology, games, and media.
|
||||
|
||||
I like to tell myself it is intelligently written, witty, and deeply interesting, but I’ve been known to lie, so I don’t know if I trust myself on that. Caveat lector.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user