From f3b92051c02aff609463339c233da668d236de5b Mon Sep 17 00:00:00 2001 From: julianjohannesen Date: Thu, 13 Dec 2018 14:16:49 -0500 Subject: [PATCH 1/4] removed root dir. version of about.md, added link for about in _pages to header in _include --- _includes/header.html | 1 + _pages/about.md | 14 ++++---------- about.md | 18 ------------------ 3 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 about.md diff --git a/_includes/header.html b/_includes/header.html index 68d02de..9efff9b 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -24,6 +24,7 @@ {%- endif -%} {%- endfor -%} + About Chat Conference Jobs diff --git a/_pages/about.md b/_pages/about.md index 08b1461..d2d8582 100644 --- a/_pages/about.md +++ b/_pages/about.md @@ -1,14 +1,8 @@ --- -excerpt: "code4lib isn't entirely about code or libraries. It is a volunteer-driven - collective of hackers, designers, architects, curators, catalogers, artists and - instigators from around the world, who largely work for and with libraries, archives - and museums on technology \"stuff.\" It started in the fall of 2003 as a mailing - list when a group of library programmers decided to create an overarching community - agnostic towards any particular language or technology. \r\n\r\nCode4Lib is dedicated - to providing a harassment-free community experience for everyone regardless of gender, - sexual orientation, disability, physical appearance, body size, race, or religion. - For more information, please see our emerging CodeofConduct4Lib.\r\n\r\n" -categories: [] +excerpt: "code4lib isn't entirely about code or libraries. It is a volunteer-driven collective of hackers, designers, architects, curators, catalogers, artists and instigators from around the world, who largely work for and with libraries, archives and museums on technology \"stuff.\" It started in the fall of 2003 as a mailing list when a group of library programmers decided to create an overarching community agnostic towards any particular language or technology. \r\n\r\nCode4Lib is dedicated to providing a harassment-free community experience for everyone regardless of gender, sexual orientation, disability, physical appearance, body size, race, or religion. + +For more information, please see our emerging CodeofConduct4Lib.\r\n\r\n" +categories: layout: page title: About permalink: /about/ diff --git a/about.md b/about.md deleted file mode 100644 index 8b4e0b2..0000000 --- a/about.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -layout: page -title: About -permalink: /about/ ---- - -This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](https://jekyllrb.com/) - -You can find the source code for Minima at GitHub: -[jekyll][jekyll-organization] / -[minima](https://github.com/jekyll/minima) - -You can find the source code for Jekyll at GitHub: -[jekyll][jekyll-organization] / -[jekyll](https://github.com/jekyll/jekyll) - - -[jekyll-organization]: https://github.com/jekyll From ef679801cd236855ba1eefd5160f56d352cd3f62 Mon Sep 17 00:00:00 2001 From: julianjohannesen Date: Fri, 14 Dec 2018 16:19:31 -0500 Subject: [PATCH 2/4] Add archive plugin, updates jekyll, minima, plugins, added layouts + a page for archives, edited config.yml, added list css --- Gemfile | 8 +++-- Gemfile.lock | 14 +++++--- _config.yml | 42 +++++++++++++++++----- _includes/header.html | 82 +++++++++++++++++++++---------------------- _layouts/archive.html | 15 ++++++++ _layouts/day.html | 15 ++++++++ _layouts/month.html | 15 ++++++++ _layouts/year.html | 15 ++++++++ _pages/archive.md | 44 +++++++++++++++++++++++ _sass/minima.scss | 45 +++++++++++++++++++----- 10 files changed, 228 insertions(+), 67 deletions(-) create mode 100644 _layouts/archive.html create mode 100644 _layouts/day.html create mode 100644 _layouts/month.html create mode 100644 _layouts/year.html create mode 100644 _pages/archive.md diff --git a/Gemfile b/Gemfile index 9d2f64d..26090fb 100644 --- a/Gemfile +++ b/Gemfile @@ -8,10 +8,10 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.8.4" +gem "jekyll", "~> 3.8.5" # This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.0" +gem "minima", "~> 2.5.0" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. @@ -19,7 +19,9 @@ gem "minima", "~> 2.0" # If you have any plugins, put them here! group :jekyll_plugins do - gem "jekyll-feed", "~> 0.6" + gem "jekyll-feed", "~> 0.11.0" + gem "jekyll-archives", "~> 2.1.1" + gem "jekyll-seo-tag", "~> 2.5.0" end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index 2aaf2ca..b761daa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,7 +27,9 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-feed (0.10.0) + jekyll-archives (2.1.1) + jekyll (>= 2.4) + jekyll-feed (0.11.0) jekyll (~> 3.3) jekyll-sass-converter (1.5.2) sass (~> 3.4) @@ -65,10 +67,12 @@ PLATFORMS ruby DEPENDENCIES - jekyll (~> 3.8.4) - jekyll-feed (~> 0.6) - minima (~> 2.0) + jekyll (~> 3.8.5) + jekyll-archives (~> 2.1.1) + jekyll-feed (~> 0.11.0) + jekyll-seo-tag (~> 2.5.0) + minima (~> 2.5.0) tzinfo-data BUNDLED WITH - 1.16.2 + 1.16.6 diff --git a/_config.yml b/_config.yml index 3758dfb..8489596 100644 --- a/_config.yml +++ b/_config.yml @@ -24,15 +24,17 @@ logo: "/files/logo/c4l_logo/c4l_logo.RGB_400px.png" logo_alt: "Code4Lib" include: ['_pages'] +# Minima theme's menu builder. Pages added to header_pages appear in navigation. header_pages: - about.md + # - music last.fm's group pages taken down # - https://shop.spreadshirt.com/code4lib/ # external links are in _includes/header.html - +# social links twitter_username: code4lib github_username: code4lib youtube_username: code4lib @@ -43,15 +45,37 @@ markdown: kramdown theme: minima plugins: - jekyll-feed + - jekyll-archives + - jekyll-seo-tag + +# jekyll-archives configuration +# See https://github.com/jekyll/jekyll-archives/blob/master/docs/configuration.md +jekyll-archives: + enabled: all # The string 'all', or an array of enabled archive types + layouts: # Specify layouts for each type of archive + year: year + month: month + day: day + category: archive + tag: archive + permalinks: # Specify permalinks for archive pages + year: 'archives/:year/' + month: 'archives/:year/:month/' + day: 'archives/:year/:month/:day/' + tag: '/tag/:name/' + category: '/category/:name/' # Exclude from processing. # The following items will not be processed, by default. Create a custom list # to override the default setting. -# exclude: -# - Gemfile -# - Gemfile.lock -# - node_modules -# - vendor/bundle/ -# - vendor/cache/ -# - vendor/gems/ -# - vendor/ruby/ +exclude: + - Gemfile + - Gemfile.lock + - node_modules + - vendor/bundle/ + - vendor/cache/ + - vendor/gems/ + - vendor/ruby/ + +keep: + - files \ No newline at end of file diff --git a/_includes/header.html b/_includes/header.html index 9efff9b..7c5db67 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,41 +1,41 @@ - + diff --git a/_layouts/archive.html b/_layouts/archive.html new file mode 100644 index 0000000..27ed772 --- /dev/null +++ b/_layouts/archive.html @@ -0,0 +1,15 @@ +--- +layout: default +--- + + +

Posts with {{ page.type }} '{{ page.title }}'.

+ + \ No newline at end of file diff --git a/_layouts/day.html b/_layouts/day.html new file mode 100644 index 0000000..f6cb605 --- /dev/null +++ b/_layouts/day.html @@ -0,0 +1,15 @@ +--- +layout: default +--- + + +

Archive of posts from {{ page.date | date: "%B %-d, %Y" }}

+ + \ No newline at end of file diff --git a/_layouts/month.html b/_layouts/month.html new file mode 100644 index 0000000..05f5744 --- /dev/null +++ b/_layouts/month.html @@ -0,0 +1,15 @@ +--- +layout: default +--- + + +

Archive of posts from {{ page.date | date: "%B %Y" }}

+ + \ No newline at end of file diff --git a/_layouts/year.html b/_layouts/year.html new file mode 100644 index 0000000..2f8e413 --- /dev/null +++ b/_layouts/year.html @@ -0,0 +1,15 @@ +--- +layout: default +--- + + +

Archive of posts from {{ page.date | date: "%Y" }}

+ + \ No newline at end of file diff --git a/_pages/archive.md b/_pages/archive.md new file mode 100644 index 0000000..979874f --- /dev/null +++ b/_pages/archive.md @@ -0,0 +1,44 @@ +--- +excerpt: "Archived posts by category and date." +categories: archive, site, admin +layout: page +title: Archive +permalink: /archive/ +created: +legacy-date: +--- + +

Posts in a given category can be reached at:

+

/category/[name of category]

+

Posts in a given date range can be reach at:

+

/archives/[year]
+/archives/[year]/[month]
+/archives/[year]/[month]/[day]

+ +
+

Post categories with corresponding number of posts:

+ +
+ +
+

Posts by year with corresponding number of posts:

+
    +{% assign counter = 0 %} +{% for post in site.posts %} + {% assign thisyear = post.date | date: "%Y" %} + {% assign prevyear = post.previous.date | date: "%Y" %} + {% assign counter = counter | plus: 1 %} + {% if thisyear != prevyear %} +
  • {{ thisyear }} ({{ counter }})
    • + {% assign counter = 0 %} + {% endif %} +{% endfor %} +
+
diff --git a/_sass/minima.scss b/_sass/minima.scss index 7695d32..ea961b1 100644 --- a/_sass/minima.scss +++ b/_sass/minima.scss @@ -43,15 +43,17 @@ $on-laptop: 800px !default; text-align: center; } + + // Use media queries like this: // @include media-query($on-palm) { -// .wrapper { -// padding-right: $spacing-unit / 2; -// padding-left: $spacing-unit / 2; -// } -// } -@mixin media-query($device) { - @media screen and (max-width: $device) { + // .wrapper { + // padding-right: $spacing-unit / 2; + // padding-left: $spacing-unit / 2; + // } + // } + @mixin media-query($device) { + @media screen and (max-width: $device) { @content; } } @@ -62,7 +64,32 @@ $on-laptop: 800px !default; // Import partials. @import - "minima/base", +"minima/base", "minima/layout", "minima/syntax-highlighting" -; + ; + +// Custom + +// Piped List +.piped-list { + position: relative; + overflow: hidden; +} +.piped-list ul { + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: center; + margin: 1em; +} +.piped-list ul li { + list-style: none; + margin: .25em 0; + padding: 0; + text-align: center; +} +li + li::before { + content: "|"; + margin: 0 .5em; +} \ No newline at end of file From 9569c5409cd52220a935b5e602a46ed8f896133f Mon Sep 17 00:00:00 2001 From: julianjohannesen Date: Fri, 14 Dec 2018 16:33:26 -0500 Subject: [PATCH 3/4] CSS fix --- _config.yml | 20 ++++++++++---------- _sass/minima.scss | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/_config.yml b/_config.yml index 8489596..7df92e0 100644 --- a/_config.yml +++ b/_config.yml @@ -68,14 +68,14 @@ jekyll-archives: # Exclude from processing. # The following items will not be processed, by default. Create a custom list # to override the default setting. -exclude: - - Gemfile - - Gemfile.lock - - node_modules - - vendor/bundle/ - - vendor/cache/ - - vendor/gems/ - - vendor/ruby/ +# exclude: +# - Gemfile +# - Gemfile.lock +# - node_modules +# - vendor/bundle/ +# - vendor/cache/ +# - vendor/gems/ +# - vendor/ruby/ -keep: - - files \ No newline at end of file +# keep: +# - files \ No newline at end of file diff --git a/_sass/minima.scss b/_sass/minima.scss index ea961b1..4e99b78 100644 --- a/_sass/minima.scss +++ b/_sass/minima.scss @@ -79,7 +79,7 @@ $on-laptop: 800px !default; .piped-list ul { display: flex; flex-direction: row; - flex-wrap: nowrap; + flex-wrap: wrap; justify-content: center; margin: 1em; } From 759e32c735b791de9e06b16ca0283c1f95066c96 Mon Sep 17 00:00:00 2001 From: julianjohannesen Date: Fri, 14 Dec 2018 19:38:21 -0500 Subject: [PATCH 4/4] remove pipe from listed posts in archives --- _pages/archive.md | 6 ++++-- _sass/minima.scss | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/_pages/archive.md b/_pages/archive.md index 979874f..74b5102 100644 --- a/_pages/archive.md +++ b/_pages/archive.md @@ -32,8 +32,10 @@ legacy-date:
    {% assign counter = 0 %} {% for post in site.posts %} - {% assign thisyear = post.date | date: "%Y" %} - {% assign prevyear = post.previous.date | date: "%Y" %} + {% if post.date %} + {% assign thisyear = post.date | date: "%Y" %} + {% assign prevyear = post.previous.date | date: "%Y" %} + {% endif %} {% assign counter = counter | plus: 1 %} {% if thisyear != prevyear %}
  • {{ thisyear }} ({{ counter }})
    • diff --git a/_sass/minima.scss b/_sass/minima.scss index 4e99b78..840e5f4 100644 --- a/_sass/minima.scss +++ b/_sass/minima.scss @@ -89,7 +89,7 @@ $on-laptop: 800px !default; padding: 0; text-align: center; } -li + li::before { +.piped-list li + li::before { content: "|"; margin: 0 .5em; } \ No newline at end of file