From 15147d7d1937d77489466fedaf41210a4ba9e0a5 Mon Sep 17 00:00:00 2001 From: Andrew Murrell Date: Wed, 15 Mar 2017 01:47:24 +0000 Subject: rename --- src/dnd/Spooky_Cave_Edited_MarieJhonson.png | Bin 955699 -> 0 bytes src/dnd/spooky.png | Bin 0 -> 955699 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/dnd/Spooky_Cave_Edited_MarieJhonson.png create mode 100644 src/dnd/spooky.png diff --git a/src/dnd/Spooky_Cave_Edited_MarieJhonson.png b/src/dnd/Spooky_Cave_Edited_MarieJhonson.png deleted file mode 100644 index 360005a..0000000 Binary files a/src/dnd/Spooky_Cave_Edited_MarieJhonson.png and /dev/null differ diff --git a/src/dnd/spooky.png b/src/dnd/spooky.png new file mode 100644 index 0000000..360005a Binary files /dev/null and b/src/dnd/spooky.png differ -- cgit v1.1-4-g5e80 From bde47bb5b29aae57f1cc682192bd31d2d9b477e4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 14 Mar 2017 22:10:27 -0400 Subject: commit the post-receive hook --- bin/post-receive.githook | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 bin/post-receive.githook diff --git a/bin/post-receive.githook b/bin/post-receive.githook new file mode 100755 index 0000000..8292df0 --- /dev/null +++ b/bin/post-receive.githook @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +set -e +whoami +export LANG=en_US.UTF-8 + +unset GIT_DIR +cd /srv/http/www.andrewdm.me +git pull --ff-only -- cgit v1.1-4-g5e80 From ee71849692690e9cd81852434f5babb5d63dc8bb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 14 Mar 2017 22:24:38 -0400 Subject: Run pre-generate server-side if it didn't already run --- bin/post-commit.githook | 1 - bin/post-receive.githook | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/post-commit.githook b/bin/post-commit.githook index 997afa3..5b05947 100755 --- a/bin/post-commit.githook +++ b/bin/post-commit.githook @@ -3,4 +3,3 @@ set -e d="$(dirname -- "$(readlink -f -- "$0")")" "$d"/auto-changelog -"$d"/pre-generate &>/dev/tty & diff --git a/bin/post-receive.githook b/bin/post-receive.githook index 8292df0..53de38c 100755 --- a/bin/post-receive.githook +++ b/bin/post-receive.githook @@ -2,7 +2,17 @@ set -e whoami export LANG=en_US.UTF-8 - unset GIT_DIR + +if ! git merge-base --is-ancestor master pre-generated; then + dir="$(mktemp --tmpdir -d www-generate.XXXXXXXXXX)" + git clone "$PWD" "$dir" + pushd "$dir" + bin/pre-generate + git push origin pre-generated + popd + rm -rf -- "$dir" +fi + cd /srv/http/www.andrewdm.me git pull --ff-only -- cgit v1.1-4-g5e80 From 5a5547251f0a29bb41832e240f9f15cb5cf002bc Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 14 Mar 2017 22:29:34 -0400 Subject: post-receive: adjust PATH with .profile if necessary --- bin/post-receive.githook | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/post-receive.githook b/bin/post-receive.githook index 53de38c..ddd74c3 100755 --- a/bin/post-receive.githook +++ b/bin/post-receive.githook @@ -4,6 +4,10 @@ whoami export LANG=en_US.UTF-8 unset GIT_DIR +if ! type scss; then + . ~/.profile +fi + if ! git merge-base --is-ancestor master pre-generated; then dir="$(mktemp --tmpdir -d www-generate.XXXXXXXXXX)" git clone "$PWD" "$dir" -- cgit v1.1-4-g5e80 From 3f1da016d022ad0dfafebf81041842364a6081ec Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 14 Mar 2017 22:42:31 -0400 Subject: Oh! The tags weren't working because case-conversion. --- lib/category.rb | 2 +- src/main.scss | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/category.rb b/lib/category.rb index b60c82e..e0ed8e0 100644 --- a/lib/category.rb +++ b/lib/category.rb @@ -6,7 +6,7 @@ class Category @abbr = abbr end def abbr - @abbr + @abbr.downcase end def name Config::get.category_name(@abbr) diff --git a/src/main.scss b/src/main.scss index 1ce7c8d..d32d6ee 100644 --- a/src/main.scss +++ b/src/main.scss @@ -109,12 +109,12 @@ article { padding: 4px 7px 5px 7px; border-radius: 2px; } - .tag.FF { background: FireBrick; } - .tag.SS { background: SeaGreen; } - .tag.ES { background: DarkViolet; } - .tag.HB { background: DimGray; } - .tag.DM { background: DarkSlateGray; } - .tag.WP { background: GhostWhite; color: black; } + .tag.ff { background: FireBrick; } + .tag.ss { background: SeaGreen; } + .tag.es { background: DarkViolet; } + .tag.hb { background: DimGray; } + .tag.dm { background: DarkSlateGray; } + .tag.wp { background: GhostWhite; color: black; } border-bottom: solid 1px #333333; } -- cgit v1.1-4-g5e80