diff --git a/Gemfile b/Gemfile index 80b518df..d7d87de2 100644 --- a/Gemfile +++ b/Gemfile @@ -21,5 +21,6 @@ gem "minima", "~> 2.0" # If you have any plugins, put them here! group :jekyll_plugins do gem "jekyll-feed", "~> 0.6" + gem "jekyll-paginate" gem "github-pages", "~> 111" end diff --git a/README.md b/README.md index 4ca29b9d..a6d41b98 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ # VocaluxeWebsite -This branch contains our GitHub-Page. It's accessible via http://new.vocaluxe.org and based on Jekyll, a popular static site generator. +This branch contains our GitHub-Page. It's accessible via http://new.vocaluxe.org and based on [Jekyll](https://jekyllrb.com/), a popular static site generator. -##Working on this website -For easier working this website and don't mess around with all other branches, we suggest to clone this as a single-branch. Just follow these steps: +## Working on this website +For easier working on this website and to not mess around with all other branches, we suggest to clone this as a single-branch. Just follow these steps: -1. Clone only `gh-pages` branch: `git clone https://github.com/Vocaluxe/Vocaluxe.git -b gh-pages --single-branch VocaluxeWeb` +1. Clone only the `gh-pages` branch: `git clone https://github.com/Vocaluxe/Vocaluxe.git -b gh-pages --single-branch VocaluxeWeb` 2. Rename remote: `git remote rename origin upstream` 3. Add your forked Vocaluxe repository as remote: `git remote add origin https://github.com/USERNAME/Vocaluxe.git` 4. Push `gh-pages` to your repository: `git push origin gh-pages` 5. Checkout your `gh-pages` branch: `git checkout origin/gh-pages -B gh-pages` -Your now able to make some changes, create commits and open pull-request. When pulling or pushing some changes, we recommend to specify your branch. Otherwise you would download the whole Vocaluxe project and waste some space. `git pull origin gh-pages` for pulling your own changes. +You're now able to make some changes, create commits and open pull-request. When pulling or pushing some changes, we recommend to specify your branch. Otherwise you would download the whole Vocaluxe project and waste some disc space. Use `git pull origin gh-pages` for pulling your own changes. -##Opening issues and pull requests -We're happy when you have some ideas or find bugs on our website. Please add the `website`-label when opening a new issue or pull request. +## Opening issues and pull requests +We're happy if you have some ideas or find bugs on our website. Please add the `website`-label when opening a new issue or pull request. diff --git a/_config.yml b/_config.yml index 0cab4720..84146909 100644 --- a/_config.yml +++ b/_config.yml @@ -62,8 +62,9 @@ web-app-mode: True post-preview-words: 80 big-post-preview-words: 200 +excerpt_separator: -#paginate: 5 +paginate: 5 ################################################################################ @@ -86,7 +87,7 @@ exclude: ["LICENSE", "README.md", "CONTRIBUTING", "CONTRIBUTORS", "scripts"] # Pagination path -paginate_path: "blog/page:num/" +paginate_path: "/blog/page:num/" # Enable minification SASS @@ -95,5 +96,6 @@ sass: gems: - github-pages - #- jekyll-paginate + - jekyll-feed + - jekyll-paginate #- jemoji diff --git a/_data/features.json b/_data/features.json index 35fc02aa..e86be21a 100644 --- a/_data/features.json +++ b/_data/features.json @@ -31,7 +31,7 @@ { "title": "Smartphone control", "image": "smartphone.png", - "description": "With the optional smartphone control you can remote control Vocaluxe or just take funny pictures of your singing friends. Add new player profiles for late arrivals or browse the song list to find out what you want to sing next." + "description": "With smartphone control you can remote control Vocaluxe or just take funny pictures of your singing friends. Add new player profiles for late arrivals or browse the song list to find out what to sing next." }, { "title": "Songs", diff --git a/_includes/footer.html b/_includes/footer.html index 4ff61d93..aa18f227 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,33 +1,29 @@ -
+ + {% include navigation.html %} + +
+ {{ post.author }}
+
+ {% for tag in post.tags %}
+