From 5af32e5976502c046e056bb8c6ba1fe3e10879d8 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 13 Jul 2017 08:57:01 +0200 Subject: [PATCH 01/15] Update README.md --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index bb88c892..ba82e5b6 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ # VocaluxeWebsite -This branch contains our GitHub-Page. It's accessible via https://vocaluxe.github.io/Vocaluxe/ and based on Jekyll, a popular static site generator. +This branch contains our GitHub-Page. It's accessible via https://vocaluxe.github.io/Vocaluxe/ 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. From ebceabb72318ee7396bb1d61fd0cfd2c1f86b6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hendrik=20Bl=C3=B6=C3=9F?= Date: Thu, 13 Jul 2017 22:42:32 +0200 Subject: [PATCH 02/15] News and RSS - reworked News section - added RSS feed --- _config.yml | 2 + _includes/footer.html | 2 +- _includes/hero_area.html | 26 +++--- _includes/news.html | 102 +++++++++++------------ _layouts/post.html | 9 +- _posts/2012-07-04-first-final-release.md | 12 ++- _posts/2012-12-21-second-release.md | 11 ++- css/main.css | 65 ++++++++++++++- 8 files changed, 144 insertions(+), 85 deletions(-) diff --git a/_config.yml b/_config.yml index f693d531..a2b32365 100644 --- a/_config.yml +++ b/_config.yml @@ -62,6 +62,7 @@ web-app-mode: True post-preview-words: 80 big-post-preview-words: 200 +excerpt_separator: #paginate: 5 @@ -95,5 +96,6 @@ sass: gems: - github-pages + - jekyll-feed #- jekyll-paginate #- jemoji diff --git a/_includes/footer.html b/_includes/footer.html index 4ff61d93..d2e97c91 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -22,7 +22,7 @@
  • - +
  • diff --git a/_includes/hero_area.html b/_includes/hero_area.html index 2968df7b..21f94fd4 100644 --- a/_includes/hero_area.html +++ b/_includes/hero_area.html @@ -1,22 +1,20 @@
    -
    -
    -
    - -
    -

    {{site.title}}

    -

    {{site.subtitle}}

    -

    {{ site.description }}

    - Download Now! - Learn More -
    - - -
    +
    +
    +
    +
    +

    {{site.title}}

    +

    {{site.subtitle}}

    +

    {{ site.description }}

    + Download Now! + Learn More
    + +
    +
    diff --git a/_includes/news.html b/_includes/news.html index 935ad037..a95ef8f8 100644 --- a/_includes/news.html +++ b/_includes/news.html @@ -2,59 +2,53 @@ {% assign post_1 = site.posts[0] %} {% assign post_2 = site.posts[1] %} {% assign post_3 = site.posts[2] %} -
    -
    -
    -

    {{ page.title }}

    - {% if post_1 != nil %} -
    -

    {{post_1.title}}

    -

    Published on {{ post_1.date | date: "%Y-%m-%d"}} by {{ post_1.author }}

    - - {% if post_1.content contains '' %} - {{ post_1.content | split:'' | first | markdownify}} - read more - {% else %} - {{ post_1.content | truncatewords: site.big-post-preview-words, "" | markdownify }} - {% if (post_1.content | number_of_words) > site.big-post-preview-words %} - read more - {% endif %} - {% endif %} -
    - {% endif %} -
    - {% if post_2 != nil %} -
    -

    {{ post_2.title }}

    -

    Published on {{ post_2.date | date: "%Y-%m-%d"}} by {{ post_2.author }}

    - {% if post_2.content contains '' %} - {{ post_2.content | split:'' | first | markdownify}} - read more - {% else %} - {{ post_2.content | truncatewords: site.post-preview-words, "" | markdownify }} - {% if (post_2.content | number_of_words) > site.post-preview-words %} - read more - {% endif %} - {% endif %} -
    - {% endif %} - {% if post_3 != nil %} -
    -

    {{ post_3.title }}

    -

    Published on {{ post_3.date | date: "%Y-%m-%d"}} by {{ post_3.author }}

    - {% if post_3.content contains '' %} - {{ post_3.content | split:'' | first | markdownify}} - read more - {% else %} - {{ post_3.content | truncatewords: site.post-preview-words, "" | markdownify }} - {% if (post_3.content | number_of_words) > site.post-preview-words %} - read more - {% endif %} - {% endif %} -
    - {% endif %} -
    -
    +
    +
    +
    +
    + + +

    {{ page.title }}

    + {% if post_1 != nil %} +
    + +
    + +

    {{post_1.title}}

    -
    +
    + {% endif %} +
    + {% if post_2 != nil %} +
    + +
    + +

    {{post_2.title}}

    +
    +
    + {% endif %} + {% if post_3 != nil %} +
    + +
    + +

    {{post_3.title}}

    +
    +
    + {% endif %} +
    + + + +
    diff --git a/_layouts/post.html b/_layouts/post.html index 698f0be1..9f1e522f 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -9,12 +9,12 @@ {% include navigation.html %} -
    +
    {% include footer.html %} - + {% include js.html %} diff --git a/_posts/2012-07-04-first-final-release.md b/_posts/2012-07-04-first-final-release.md index c856b3a1..d9ba9bcc 100644 --- a/_posts/2012-07-04-first-final-release.md +++ b/_posts/2012-07-04-first-final-release.md @@ -4,14 +4,20 @@ section-type: post title: First final release! tags: [ 'release', '0.1' ] author: "flokuep" -image: release-01.png +image: "release-01.png" --- +![Release 1]({{site.baseurl}}/img/posts/release-01.png){:.post-banner} -#### Dear Vocaluxe fans, +Dear Vocaluxe fans, just in time for the holidays we've compiled our first final release after roughly one year of development time - Vocaluxe 0.1 final is ready to be unleashed! So don't think twice and download it from Sourceforge. How about a round (or two?) of Vocaluxe between the egg hunt and the lamb roast? You don't want to wait for the next final release and want to follow the latest edge of development instead? Just follow the developers on the Github Vocaluxe repository! -[![Song Selection]({{site.baseurl}}/img/posts/release-01_Screenshot_SongSelection_Small.png){:class="img-responsive"}]({{site.baseurl}}/img/posts/release-01_Screenshot_SongSelection.png){:class="img-responsive" data-lightbox="screenshots" data-title="Song Selection"} + +## Gallery + +{:class="post-gallery"} + +[![Song Selection]({{site.baseurl}}/img/posts/release-01_Screenshot_SongSelection.png){:class="img-responsive"}]({{site.baseurl}}/img/posts/release-01_Screenshot_SongSelection.png){:class="img-responsive" data-lightbox="screenshots" data-title="Song Selection"} diff --git a/_posts/2012-12-21-second-release.md b/_posts/2012-12-21-second-release.md index 35e162bc..f0daee41 100644 --- a/_posts/2012-12-21-second-release.md +++ b/_posts/2012-12-21-second-release.md @@ -4,14 +4,17 @@ section-type: post title: Second version released! tags: [ 'release', '0.2' ] author: "flokuep" -image: release-02.png +image: "release-02.png" --- -#### Dear Vocaluxe fans, +![Release 2]({{site.baseurl}}/img/posts/release-02.png){:.post-banner} -#### we've finished Vocaluxe v0.2 after 8 months of development. -The new version has the following new features: +Dear Vocaluxe fans, + +we've finished Vocaluxe v0.2 after 8 months of development. +The new version has the following new features: + * Support for up to 6 microphones. * Medley mode * Short Song mode (short version of a song) diff --git a/css/main.css b/css/main.css index 8d720ae2..9f2a1dc7 100644 --- a/css/main.css +++ b/css/main.css @@ -113,6 +113,7 @@ a:hover { .row { padding: 50px 0px; + margin: 0; } .btn { @@ -351,6 +352,47 @@ a:hover { /**************/ +/*****News*****/ + + +#news img { + width: 100%; +} + +#news .col-md-8, +#news .col-lg-12 { + border: 1px solid black; + border-radius: 5px; +} + +#news h2, +#news h3 { + margin-top: 0; + margin-bottom: 25px; +} + +#news .post-info { + font-size: 12pt; +} + +#news .btn { + align-items: +} + +.news-card { + padding: 0; +} + +.news-card-text { + padding: 10px; + color: white ; +} + +.news-card-text a { + color: white; +} + +/**************/ /***Download***/ @@ -551,17 +593,32 @@ a:hover { /*****Post*****/ +.post .post-banner { + width: 100%; +} + +.post-gallery { + display: flex; + flex-wrap: wrap; +} + +.post-gallery a { + max-width: 220px; + margin: 4px; +} + .post-info { display: inline-block; margin-bottom: 15px; + font-size: 13pt; } .avatar { border-radius: 50%; position: relative; top: 3px; - height: 18px; - width: 18px; + height: 18px !important; + width: 18px !important; vertical-align: baseline; } @@ -577,9 +634,9 @@ a:hover { .chip { display: inline-block; padding: 0 10px; - height: 28px; + height: 26px; color: white; - border-radius: 14px; + border-radius: 13px; } From 5969ffab71b178376dbaeffc8a2ea9ed6b8bd143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hendrik=20Bl=C3=B6=C3=9F?= Date: Thu, 13 Jul 2017 22:48:41 +0200 Subject: [PATCH 03/15] Quick CSS fix - fixed border of post --- css/main.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/css/main.css b/css/main.css index 9f2a1dc7..485c4fc0 100644 --- a/css/main.css +++ b/css/main.css @@ -361,8 +361,9 @@ a:hover { #news .col-md-8, #news .col-lg-12 { - border: 1px solid black; - border-radius: 5px; + border: 1px solid #2C3E50; + border-radius: 8px; + overflow: hidden; } #news h2, From ce225e401b070a2fd854a3ec58087b6bb16ad264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hendrik=20Bl=C3=B6=C3=9F?= Date: Fri, 14 Jul 2017 15:49:07 +0200 Subject: [PATCH 04/15] Small fixes and improvements - fixed footer not staying at bottom - fixed some bugs with news section --- _includes/footer.html | 40 +++++++++++++++------------------- _includes/news.html | 18 ++++++++------- _posts/2017-07-14-test-post.md | 25 +++++++++++++++++++++ css/main.css | 30 ++++++++++++------------- 4 files changed, 68 insertions(+), 45 deletions(-) create mode 100644 _posts/2017-07-14-test-post.md diff --git a/_includes/footer.html b/_includes/footer.html index d2e97c91..aa18f227 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,33 +1,29 @@ - diff --git a/_includes/news.html b/_includes/news.html index a95ef8f8..319f165d 100644 --- a/_includes/news.html +++ b/_includes/news.html @@ -10,14 +10,16 @@

    {{ page.title }}

    {% if post_1 != nil %} -
    - -
    -