diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index b6a9a503f4..0000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -custom: ['https://www.wowthemes.net/donate/'] diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 8312df086d..1229672d03 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ _site *.swp .sass-cache *~ +tmp diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000000..57cf282ebb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..81694cb56b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,31 @@ +language: ruby +cache: bundler +sudo: false +before_install: + - gem install bundler -v 2.1.2 +branches: + only: + - master +script: + - JEKYLL_ENV=production bundle install + - JEKYLL_ENV=production bundle exec jekyll build --destination docs + - echo "blog.mothertongues.org" >> docs/CNAME + - bundle exec rake test +env: + global: + - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer +addons: + apt: + packages: + - libcurl4-openssl-dev # required to avoid SSL errors +deploy: + provider: pages + local_dir: ./docs + target-branch: gh-pages + email: deploy@travis-ci.org + name: Deployment Bot + skip-cleanup: true + github-token: $GITHUB_TOKEN + keep-history: true + on: + branch: master \ No newline at end of file diff --git a/404.html b/404.html old mode 100644 new mode 100755 diff --git a/Gemfile b/Gemfile old mode 100644 new mode 100755 index b8073827f0..934bcf279c --- a/Gemfile +++ b/Gemfile @@ -17,4 +17,6 @@ group :jekyll_plugins do gem 'jekyll-archives' gem 'kramdown' gem 'rouge' + gem 'rake' + gem 'html-proofer' end diff --git a/Gemfile.lock b/Gemfile.lock old mode 100644 new mode 100755 index 52ff7c4619..c61fad32e2 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,11 +8,21 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) + ethon (0.12.0) + ffi (>= 1.3.0) eventmachine (1.2.7) eventmachine (1.2.7-x64-mingw32) ffi (1.10.0) ffi (1.10.0-x64-mingw32) forwardable-extended (2.6.0) + html-proofer (3.15.1) + addressable (~> 2.3) + mercenary (~> 0.3) + nokogumbo (~> 2.0) + parallel (~> 1.3) + rainbow (~> 3.0) + typhoeus (~> 1.3) + yell (~> 2.0) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -49,9 +59,19 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) mercenary (0.3.6) + mini_portile2 (2.4.0) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + nokogiri (1.10.9-x64-mingw32) + mini_portile2 (~> 2.4.0) + nokogumbo (2.0.2) + nokogiri (~> 1.8, >= 1.8.4) + parallel (1.19.1) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (3.0.3) + rainbow (3.0.0) + rake (13.0.1) rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) @@ -63,19 +83,24 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + typhoeus (1.3.1) + ethon (>= 0.9.0) + yell (2.2.2) PLATFORMS ruby x64-mingw32 DEPENDENCIES + html-proofer jekyll-archives jekyll-feed jekyll-paginate jekyll-seo-tag jekyll-sitemap kramdown + rake rouge BUNDLED WITH - 2.0.1 + 2.1.2 diff --git a/LICENSE.txt b/LICENSE.txt old mode 100644 new mode 100755 index 61f4e6478d..23417c87d1 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2019 WowThemes.net +Copyright (c) 2020 Aidan Pine License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md old mode 100644 new mode 100755 index a1ff70173f..0abbd9d973 --- a/README.md +++ b/README.md @@ -1,23 +1,32 @@ -# Mediumish - Jekyll Theme +# Mother Tongues Blog -[Live Demo](https://wowthemesnet.github.io/mediumish-theme-jekyll/)   |   [Download](https://github.com/wowthemesnet/mediumish-theme-jekyll/archive/master.zip)   |   [Documentation](https://bootstrapstarter.com/bootstrap-templates/template-mediumish-bootstrap-jekyll/)   |   [Buy me a coffee](https://www.wowthemes.net/donate/) +Welcome to the Mother Tongues Blog repository. -![mediumish](assets/images/mediumish-jekyll-template.png) +## Guide +To contribute to the site, please have a read through the purpose of the Git branches: + +- master: Changes made here will build and push to `gh-pages`. +- gh-pages: This branch is auto generated from the `master` branch. Do **not** edit this directly, as edits will be overwritten. +- dev.author: Create and continue to work on new posts here. You can spin off extra branches like `dev.author-aidan` for example, but you must merge them into `dev.author` before merging to `master` and pushing a new release. ### Copyright -Copyright (C) 2019 Sal, https://www.wowthemes.net +Copyright Blog (C) 2020 Aidan, https://aidanpine.ca -**Mediumish for Jekyll** is designed and developed by [Sal](https://www.wowthemes.net) and it is *free* under MIT license. +Copyright Theme (C) 2019 Sal, https://www.wowthemes.net -Buy Me A Coffee +Posts are copyrighted by authors! ### Contribute -1. [Fork the repo](https://github.com/wowthemesnet/mediumish-theme-jekyll). +1. [Fork the repo](https://github.com/roedoejet/mothertongues-blog). 2. Clone a copy of your fork on your local 3. Create a branch off of master and give it a meaningful name (e.g. my-new-mediumish-feature). 4. Make necessary changes, commit, push and open a pull request on GitHub. +### Acknowledgements + +This blog was created from a fork of the fantastic [WowThemes Mediumish theme](https://wowthemesnet.github.io/mediumish-theme-jekyll/) + Thank you! diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000000..9791dfa945 --- /dev/null +++ b/Rakefile @@ -0,0 +1,26 @@ +abort('Please run this using `bundle exec rake`') unless ENV["BUNDLE_BIN_PATH"] +require 'html-proofer' + +desc "Test the website" +task :test do + sh "bundle exec jekyll build" + options = { + # :check_sri => true, + :check_external_hash => true, + :check_html => true, + :check_img_http => true, + :allow_hash_href => true, + :check_opengraph => true, + :enforce_https => true, + :cache => { + :timeframe => '6w' + } + } + begin + HTMLProofer.check_directory("./_site", options).run + rescue => msg + puts "#{msg}" + end +end + +task :default => [:test] \ No newline at end of file diff --git a/_config.yml b/_config.yml old mode 100644 new mode 100755 index 8f192fabcd..049364ce6b --- a/_config.yml +++ b/_config.yml @@ -1,35 +1,61 @@ # Site -name: "Mediumish" -title: "Mediumish" -description: "Jekyll template, Medium styled, free for bloggers." -logo: 'assets/images/logo.png' -favicon: 'assets/images/logo.png' -baseurl: /mediumish-theme-jekyll -google_analytics: 'UA-46278016-1' -disqus: 'demowebsite' -mailchimp-list: 'https://wowthemes.us11.list-manage.com/subscribe/post?u=8aeb20a530e124561927d3bd8&id=8c3d2d214b' +name: "Mother Tongues Blog" +title: "Mother Tongues Blog" +description: "Smashing the lore of language technology!" +logo: 'assets/images/logo_no_text.png' +favicon: 'assets/images/favicon.ico' +url: https://blog.mothertongues.org +baseurl: '' +google_analytics: 'UA-100872710-18' +disqus: 'mothertongues' +mailchimp-list: 'https://mailchi.mp/b87b1fbde236/mothertongues' include: ["_pages"] permalink: /:title/ +# Assets +assets: + defaults: + integrity: + css: true + # Authors authors: - sal: - name: Sal - display_name: Sal - gravatar: e56154546cf4be74e393c62d1ae9f9d4 - email: wowthemesnet@gmail.com - web: https://www.wowthemes.net - twitter: https://twitter.com/wowthemesnet - description: "Author of Mediumish, a Bootstrap Medium styled template available for WordPress, HTML, Ghost and Jekyll. You are currently previewing Jekyll template demo." - john: - name: John - display_name: John - avatar: 'assets/images/avatar.png' - gravatar: b1cc14991db7a456fcd761680bbc8f81 - email: wowthemesnet@gmail.com - web: https://www.wowthemes.net - twitter: https://twitter.com/wowthemesnet - description: "This is the author box. Write a short description of the author here. You are currently previewing Mediumish demo, a Jekyll template compatible with Github pages." + # Note: jekyll-seo-tag expects these keys to be your Twitter handle. + # If you want your posts to be associated with your Twitter handle, + # make sure your short name here to match your @: + # See: https://github.com/jekyll/jekyll-seo-tag/blob/master/docs/advanced-usage.md#author-information + aidan: + name: Aidan + display_name: Aidan + gravatar: 7623fd3eeb0acbe1084fecc20c3093ae + email: hello@aidanpine.ca + web: https://aidanpine.ca + twitter: https://twitter.com/aidanpine + description: "Lead developer of Mother Tongues." + _eddieantonio: + name: Eddie + display_name: Eddie + gravatar: 7183e460abfb84d668e408c32631abd4 + email: easantos+mothertongues@ualberta.ca + web: https://eddieantonio.ca/ + twitter: https://twitter.com/_eddieantonio + description: "Software developer and Unicode nerd" + delaney: + name: Delaney + display_name: Delaney + gravatar: 61082587e1c6a9ad625bb21be29142d5 + email: dlothian@ualberta.ca + web: + twitter: + description: "âpihtawikosisâniskwew and ILT Developer" + fineen: + name: Fineen + display_name: Fineen + gravatar: 1a0dea18a388e55c10684cf8055d1607 + email: fineen.davis@gmail.com + web: + twitter: + description: "Computational linguist" # Plugins plugins: @@ -50,7 +76,13 @@ jekyll-archives: # Pagination paginate: 6 paginate_path: /page:num/ - + +# SEO +twitter: + # the "site's" username + username: AidanPine + card: summary_large_image + # Other markdown: kramdown @@ -63,10 +95,10 @@ kramdown: # Adsense (change to "enabled" to activate, also your client id and ad slot. Create a new ad unit from your Adsense account to get the slot.) adsense: "disabled" -adsense-data-ad-client: "ca-pub-3412143450191416" -adsense-data-ad-slot: "1363087678" +# adsense-data-ad-client: "ca-pub-3412143450191416" +# adsense-data-ad-slot: "1363087678" # Lazy Images ("enabled" or "disabled") lazyimages: "disabled" -exclude: [changelog.md, LICENSE.txt, README.md, Gemfile, Gemfile.lock] +exclude: [changelog.md, LICENSE.txt, README.md, Gemfile, Gemfile.lock, vendor] diff --git a/_includes/adsense-under-header.html b/_includes/adsense-under-header.html old mode 100644 new mode 100755 diff --git a/_includes/disqus.html b/_includes/disqus.html old mode 100644 new mode 100755 index af4d8719c9..4e9bb8109b --- a/_includes/disqus.html +++ b/_includes/disqus.html @@ -9,6 +9,6 @@ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); })(); - - comments powered by Disqus + + comments powered by Disqus diff --git a/_includes/featuredbox.html b/_includes/featuredbox.html old mode 100644 new mode 100755 index 90f1b2902d..f5fc132550 --- a/_includes/featuredbox.html +++ b/_includes/featuredbox.html @@ -3,6 +3,7 @@
+ {% if post.image %}
@@ -16,6 +17,7 @@
+ {% endif %}
@@ -46,7 +48,7 @@

{{ post.excerpt | strip_html | truncatewords:25 }}

{% endif %} - +
diff --git a/_includes/pagination.html b/_includes/pagination.html old mode 100644 new mode 100755 diff --git a/_includes/postbox.html b/_includes/postbox.html old mode 100644 new mode 100755 index 80160e2d43..11094b61cc --- a/_includes/postbox.html +++ b/_includes/postbox.html @@ -3,6 +3,7 @@
+ {% if post.image %} + {% endif %}

{{ post.title }} @@ -40,6 +42,8 @@

{{ post.excerpt | strip_html | truncatewords:30 }}

{{ author.display_name }}
{% endif %} +
+
diff --git a/_includes/search-lunr.html b/_includes/search-lunr.html old mode 100644 new mode 100755 diff --git a/_includes/share.html b/_includes/share.html old mode 100644 new mode 100755 diff --git a/_includes/star_rating.html b/_includes/star_rating.html old mode 100644 new mode 100755 diff --git a/_includes/star_rating_postbox.html b/_includes/star_rating_postbox.html old mode 100644 new mode 100755 diff --git a/_includes/toc.html b/_includes/toc.html old mode 100644 new mode 100755 diff --git a/_layouts/archive.html b/_layouts/archive.html old mode 100644 new mode 100755 diff --git a/_layouts/categories.html b/_layouts/categories.html old mode 100644 new mode 100755 index 75963ad94c..5cb5545ad9 --- a/_layouts/categories.html +++ b/_layouts/categories.html @@ -7,7 +7,7 @@
{% for category in site.categories %}
-

Category {{ category[0] }}

+

Category {{ category[0] }}

{% assign pages_list = category[1] %} {% for post in pages_list %} diff --git a/_layouts/default.html b/_layouts/default.html old mode 100644 new mode 100755 index 337b917db3..d3a5349420 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,208 +1,237 @@ + - - + + + + + + {{ page.title }} | {{site.name}} + + {% seo title=false %} - + -{{ page.title }} | {{site.name}} + -{% seo %} + - - - + - + - + + + + + {% if jekyll.environment == 'production' %} {% endif %} {% capture layout %}{% if page.layout %}layout-{{ page.layout }}{% endif %}{% endcapture %} + - - + + - -