diff --git a/Gemfile.lock b/Gemfile.lock index 0685d10..c4bd32a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,13 +8,13 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.5-x64-mingw32) - ffi (1.9.23-x64-mingw32) + eventmachine (1.2.7-x64-mingw32) + ffi (1.9.25-x64-mingw32) forwardable-extended (2.6.0) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.3) + jekyll (3.7.4) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -27,35 +27,35 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-feed (0.9.3) + jekyll-feed (0.11.0) jekyll (~> 3.3) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.4.0) + jekyll-seo-tag (2.5.0) jekyll (~> 3.3) - jekyll-watch (2.0.0) + jekyll-watch (2.1.2) listen (~> 3.0) - kramdown (1.16.2) - liquid (4.0.0) + kramdown (1.17.0) + liquid (4.0.1) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) mercenary (0.3.6) - minima (2.4.1) + minima (2.5.0) jekyll (~> 3.5) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) pathutil (0.16.1) forwardable-extended (~> 2.6) - public_suffix (3.0.2) + public_suffix (3.0.3) rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - rouge (3.1.1) + rouge (3.3.0) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.6) + sass (3.6.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -63,7 +63,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - tzinfo-data (1.2018.4) + tzinfo-data (1.2018.6) tzinfo (>= 1.0.0) wdm (0.1.1) @@ -78,4 +78,4 @@ DEPENDENCIES wdm (~> 0.1.0) BUNDLED WITH - 1.16.1 + 1.16.2 diff --git a/_config.yml b/_config.yml index a3ef09c..173bd50 100644 --- a/_config.yml +++ b/_config.yml @@ -2,13 +2,28 @@ markdown: kramdown exclude: - .idea - - node_modules include: - _pages - _posts plugins: - jekyll-feed +collections_dir: collections +collections: + artists: + output: true + permalink: /artists/:slug + events: + output: false + +defaults: +- scope: + path: "" + type: channels + values: + layout: channel + + sass: load_paths: - _sass diff --git a/_includes/artist.html b/_includes/artist.html new file mode 100644 index 0000000..819be8c --- /dev/null +++ b/_includes/artist.html @@ -0,0 +1,12 @@ +
+ {% if artist.image %} + + {% endif %} +
{{ artist.name }}
+ {% if artist.links.furaffinity %} + + {% endif %} + {% if artist.links.twitter %} + + {% endif %} +
\ No newline at end of file diff --git a/_includes/event.html b/_includes/event.html new file mode 100644 index 0000000..31b1ae3 --- /dev/null +++ b/_includes/event.html @@ -0,0 +1,12 @@ +
+

{{ event.name }}

+
Date: {{ event.date | date_to_long_string }}
+
Time: {{ event.time }}
+ {% if event.location %} +
Location: {{ event.location }}
+ {% endif %} + {% if event.address %} +
Address: {{ event.address }}
+ {% endif %} +

{{ event.about }}

+
diff --git a/_includes/header.html b/_includes/header.html index e69de29..fb0c17c 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -0,0 +1,20 @@ + \ No newline at end of file diff --git a/_pages/anthrosoutheast.html b/_pages/anthrosoutheast.html new file mode 100644 index 0000000..2284a7b --- /dev/null +++ b/_pages/anthrosoutheast.html @@ -0,0 +1,5 @@ +--- +layout: default +title: Anthro South East +permalink: /anthro-south-east/ +--- \ No newline at end of file diff --git a/_pages/artists.html b/_pages/artists.html new file mode 100644 index 0000000..45cf2bc --- /dev/null +++ b/_pages/artists.html @@ -0,0 +1,12 @@ +--- +layout: default +title: Artists +permalink: /artists/ +--- + +
+ {% assign artists = site.artists | sort: 'name' %} + {% for artist in artists %} + {% include artist.html %} + {% endfor %} +
\ No newline at end of file diff --git a/_pages/events.html b/_pages/events.html new file mode 100644 index 0000000..a7dca7f --- /dev/null +++ b/_pages/events.html @@ -0,0 +1,12 @@ +--- +layout: default +title: Events +permalink: /events/ +--- + +
+ {% assign events = site.events | sort: 'date' %} + {% for event in events %} + {% include event.html %} + {% endfor %} +
\ No newline at end of file diff --git a/_sass/_artists.scss b/_sass/_artists.scss new file mode 100644 index 0000000..d073457 --- /dev/null +++ b/_sass/_artists.scss @@ -0,0 +1,29 @@ +.artist { + background-color: #ccc; + margin: 1em 10%; + padding: .25em .5em; + + img { + width: 100%; + } + + .name { + font-weight: bold; + text-align: center; + } + + .icon { + background-position: center center; + background-repeat: no-repeat; + display: inline-block; + height: 30px; + width: 30px; + + &.icon-furaffinity { + background-image: url("/images/icons/furaffinity.svg"); + } + &.icon-twitter { + background-image: url("/images/icons/twitter.svg"); + } + } +} \ No newline at end of file diff --git a/_sass/_events.scss b/_sass/_events.scss new file mode 100644 index 0000000..cbdde20 --- /dev/null +++ b/_sass/_events.scss @@ -0,0 +1,11 @@ +.event { + background-color: #ccc; + margin: 1em 10%; + padding: .25em .5em; + width: 80%; + + .date, + .time { + font-size: .9em; + } +} \ No newline at end of file diff --git a/collections/_artists/theredghost.md b/collections/_artists/theredghost.md new file mode 100644 index 0000000..46c8963 --- /dev/null +++ b/collections/_artists/theredghost.md @@ -0,0 +1,8 @@ +--- +name: TheRedGhost +slug: theredghost + +links: + furaffinity: theredghost + twitter: theredghostart +--- \ No newline at end of file diff --git a/collections/_events/boo-at-the-zoo.md b/collections/_events/boo-at-the-zoo.md new file mode 100644 index 0000000..b1f95b5 --- /dev/null +++ b/collections/_events/boo-at-the-zoo.md @@ -0,0 +1,6 @@ +--- +name: Boo at the Zoo +date: 2018-10-27 +time: 5pm - 8:30pm +about: Admission is free just tell them you are with Chattoonie, The Education Center in the back of the Zoo is where we can store things and suit up at etc. I will be arriving early to help those who are coming. Fursuiting is allowed. All is welcome! +--- \ No newline at end of file diff --git a/css/default.scss b/css/default.scss index 7b9abf4..3f8a0d2 100644 --- a/css/default.scss +++ b/css/default.scss @@ -2,6 +2,8 @@ --- @import "bootstrap/scss/bootstrap"; +@import "artists"; +@import "events"; @charset "utf-8"; diff --git a/images/icons/furaffinity.svg b/images/icons/furaffinity.svg new file mode 100644 index 0000000..2b8daab --- /dev/null +++ b/images/icons/furaffinity.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/images/icons/twitter.svg b/images/icons/twitter.svg new file mode 100644 index 0000000..ed0ae17 --- /dev/null +++ b/images/icons/twitter.svg @@ -0,0 +1 @@ + \ No newline at end of file