diff --git a/Gemfile.lock b/Gemfile.lock index 29e27595..f7a25d0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -200,7 +200,7 @@ DEPENDENCIES minima (~> 2.0) RUBY VERSION - ruby 2.3.3p222 + ruby 2.2.3p173 BUNDLED WITH 1.13.6 diff --git a/_includes/about.html b/_includes/about.html index 33d8c4c5..c3b81ace 100644 --- a/_includes/about.html +++ b/_includes/about.html @@ -1,25 +1,25 @@
-
-
-

{{ page.title }}

-

{{ page.subtitle }}

+
+
+

{{ page.title }}

+

{{ page.subtitle }}

- {% for feature in site.data.features %} -
-
- -
-
-
-

{{ feature.title }}

-

{{ feature.description }}

-
-
-
-
- {% endfor %} -
-
+ {% for feature in site.data.features %} +
+
+ +
+
+
+

{{ feature.title }}

+

{{ feature.description }}

+
+
+
+
+ {% endfor %} +
+
diff --git a/_includes/contribute.html b/_includes/contribute.html index 8431c751..65e78a57 100644 --- a/_includes/contribute.html +++ b/_includes/contribute.html @@ -1,18 +1,20 @@
-
-
-

{{ page.title }}

- {{ page.content | markdownify }} - {% for contribute in site.data.contribute %} -
-

{{ contribute.title }}

- -

{{ contribute.description }}

-

{{ contribute.url_text }}

-
- {% endfor %} -
-
+
+
+

{{ page.title }}

+ {{ page.content | markdownify }} +
+ {% for contribute in site.data.contribute %} +
+

{{ contribute.title }}

+ +

{{ contribute.description }}

+

{{ contribute.url_text }}

+
+ {% endfor %} +
+
+
diff --git a/_includes/download.html b/_includes/download.html index ca9d2bcd..f6d83b1e 100644 --- a/_includes/download.html +++ b/_includes/download.html @@ -4,16 +4,16 @@ {% assign release_stable = nil %} {% for release in site.github.releases %} - {% if release.tag_name == "Nightly" %} - {% assign release_nightly = release %} - {% elsif release.prerelease == true and (release_pre == nil or release.created_at > release_pre.created_at) %} - {% assign release_pre = release %} - {% elsif release_stable == nil or release.created_at > release_stable.created_at %} - {% endif %} + {% if release.tag_name == "Nightly" %} + {% assign release_nightly = release %} + {% elsif release.prerelease == true and (release_pre == nil or release.created_at > release_pre.created_at) %} + {% assign release_pre = release %} + {% elsif release_stable == nil or release.created_at > release_stable.created_at %} + {% endif %} {% endfor %}
-
-
+
+

{{ page.title }}

We provide portable versions of Vocaluxe for every release. If you want to try our stable release, you could also use our installer. If you're on Linux, you need to compile Vocaluxe yourself (for advanced users). If you're looking for some older versions, check out our releases on GitHub and Sourceforge.

@@ -72,13 +72,13 @@ {% assign currentReleaseArch = currentReleaseData[3] %} {% include downloadButton.html title=currentReleaseTitle os=currentReleaseOs arch=currentReleaseArch url=asset.browser_download_url %} {% endfor %} - + {% else %}

There isn't any stable release yet.

{% endif %}
-
-
+
+
diff --git a/_includes/head.html b/_includes/head.html index 1e3388dd..201b1c6e 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,46 +1,46 @@ - - - - - - - {{site.title}}{% if page.title %} | {{page.title}}{% endif %} - - {% if site.favicon %} - - {% endif %} + + + + + + + {{site.title}}{% if page.title %} | {{page.title}}{% endif %} + + {% if site.favicon %} + + {% endif %} - - - - - + + + + + - - + + - - + + - + - - - + + + - - - - - - - {% include color-browser.html %} + + + + + + + {% include color-browser.html %} diff --git a/_includes/help.html b/_includes/help.html index 602abdca..bc66e6c4 100644 --- a/_includes/help.html +++ b/_includes/help.html @@ -1,18 +1,20 @@
-
-
-

{{ page.title }}

-

{{ page.content | markdownify }}

- {% for help in site.data.help %} -
-

{{ help.title }}

- -

{{ help.description }}

-

{{ help.url_text }}

-
- {% endfor %} -
-
+
+
+

{{ page.title }}

+

{{ page.content | markdownify }}

+
+ {% for help in site.data.help %} +
+

{{ help.title }}

+ +

{{ help.description }}

+

{{ help.url_text }}

+
+ {% endfor %} +
+
+
diff --git a/_includes/hero_area.html b/_includes/hero_area.html index 456eed1c..f23a3f90 100644 --- a/_includes/hero_area.html +++ b/_includes/hero_area.html @@ -1,22 +1,22 @@
-
-
-
-

{{site.title}}

-

{{site.subtitle}}

+
+
+
+

{{site.title}}

+

{{site.subtitle}}

- + -
-

{{ site.description }}

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

{{ site.description }}

+ Download Now! + Learn More +
+
+
+
diff --git a/_includes/hero_area_small.html b/_includes/hero_area_small.html index 8fa5020d..2cae3fc7 100644 --- a/_includes/hero_area_small.html +++ b/_includes/hero_area_small.html @@ -1,14 +1,14 @@
-
-
-
-

{{site.title}}

-

{{site.subtitle}}

-
-
-
+
+
+
+

{{site.title}}

+

{{site.subtitle}}

+
+
+
diff --git a/_includes/navigation.html b/_includes/navigation.html index 8a6376b4..5e2a9236 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -11,47 +11,47 @@ {% if page.section-type == "index" %} - + {% else %} - + {% endif %} -
+
{% if site.faviconPng %} - + {% endif %} - {{ site.title }} + {{ site.title }}
- +
diff --git a/_includes/news.html b/_includes/news.html index c7b4a644..74df664c 100644 --- a/_includes/news.html +++ b/_includes/news.html @@ -3,34 +3,58 @@ {% 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 }}

- - {{ post_1.content | truncatewords: site.big-post-preview-words | markdownify }} -
- {% endif %} -
- {% if post_2 != nil %} -
-

{{ post_2.title }}

-

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

- {{ post_2.content | truncatewords: site.post-preview-words | markdownify }} -
- {% endif %} - {% if post_3 != nil %} -
-

{{ post_3.title }}

-

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

- {{ post_3.content | truncatewords: site.post-preview-words | markdownify }} -
- {% endif %} -
-
-
+
+
+

{{ 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 %} +
+
+
diff --git a/_includes/songs.html b/_includes/songs.html index 07a8432d..94656679 100644 --- a/_includes/songs.html +++ b/_includes/songs.html @@ -1,18 +1,23 @@
-
-
-

{{ page.title }}

- {{ page.content | markdownify }} - {% for song in site.data.songs %} -
-

{{ song.title }}

- -

{{ song.description }}

-

{{ song.url_text }}

-
- {% endfor %} -
-
+
+
+

{{ page.title }}

+ {{ page.content | markdownify }} +
+ {% for song in site.data.songs %} +
+

{{ song.title }}

+ +

{{ song.description }}

+

{{ song.url_text }}

+ {% if song.title=='Download' %} +

CURRENTLY OFFLINE

+ {% endif %} +
+ {% endfor %} +
+
+
diff --git a/_layouts/index.html b/_layouts/index.html index 3f848bc0..507042fa 100644 --- a/_layouts/index.html +++ b/_layouts/index.html @@ -7,20 +7,20 @@ {% include head.html %} - - {% include navigation.html %} - - {% include hero_area.html %} - - {% for p in site.pages_list %} - {% for page in site.pages %} - {% if p[1] == page.section-type %} - {% include {{ page.path }} %} - {% endif %} - {% endfor %} - {% endfor %} - - {% include js.html %} + + {% include navigation.html %} + + {% include hero_area.html %} + + {% for p in site.pages_list %} + {% for page in site.pages %} + {% if p[1] == page.section-type %} + {% include {{ page.path }} %} + {% endif %} + {% endfor %} + {% endfor %} + + {% include js.html %} diff --git a/_layouts/post.html b/_layouts/post.html index 017835ee..cc7b42b9 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -6,22 +6,22 @@ {% include head.html %} - - {% include navigation.html %} - - {% include hero_area_small.html %} -
-
-
-

{{page.title}}

-

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

- - {{ page.content | markdownify }} -
-
+ + {% include navigation.html %} + + {% include hero_area_small.html %} +
+
+
+

{{page.title}}

+

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

+ + {{ page.content | markdownify }} +
+
- {% include js.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 d0897230..c856b3a1 100644 --- a/_posts/2012-07-04-first-final-release.md +++ b/_posts/2012-07-04-first-final-release.md @@ -7,11 +7,11 @@ author: "flokuep" image: release-01.png --- -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! -![Screenshot2](https://vocaluxe.sourceforge.io/style/images/Screenshot_SongSelection_small.png){:class="img-responsive"} +[![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"} diff --git a/_posts/2012-12-21-second-release.md b/_posts/2012-12-21-second-release.md index 25ddcf9e..37e4241b 100644 --- a/_posts/2012-12-21-second-release.md +++ b/_posts/2012-12-21-second-release.md @@ -6,15 +6,17 @@ tags: [ 'release', '0.2' ] author: "flokuep" image: release-02.png --- -Dear Vocaluxe fans, +#### Dear Vocaluxe fans, -we've finished Vocaluxe v0.2 after 8 months of development. +#### 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) * Playlists: Create, Save, Edit by keyboard or mouse (drag&drop). You can adjust the sing mode for each song of the playlist individually (normal, medley, duet, short song). + * Introduced popup controls. You can control the background music by a control panel that appears at the top border of the screen if you press "TAB" or reaches it by mouse. You can even start singing of the currently played background song. * Webcam support: * Activating/deactivating with "W" in the sing screen. @@ -24,4 +26,4 @@ The new version has the following new features: * Improved keyboard navigation * Improved mouse navigation * Improved pitch recognition -* You can specify the duet singer names in the song txt by #P1 and #P2. Afterwards you can assign that names to the players in die name selection screen. +* You can specify the duet singer names in the song txt by #P1 and #P2. Afterwards you can assign that names to the players in die name selection screen. \ No newline at end of file diff --git a/css/main.css b/css/main.css index c68148fa..97daf6ee 100644 --- a/css/main.css +++ b/css/main.css @@ -377,6 +377,11 @@ a:hover { flex-direction: column; } +.flex-box-row { + display:flex; + flex-direction: row; +} + .flex00a { flex: 0 0 auto; } @@ -391,4 +396,29 @@ a:hover { .no-release-text { margin-top: 40px; +} + +.stamp { + position: absolute; + display: inline-block; + color: red; + padding: 15px; + background-color: white; + box-shadow: inset 0px 0px 0px 10px red; + transform: rotate(30deg); + margin-top: 20%; + margin-left: 20%; + font-size: 25px; + width: 65%; +} + +.stamp:after { + content: ''; + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + background-image: url("../img/stamp.jpg"); + mix-blend-mode: lighten; } \ No newline at end of file diff --git a/img/posts/release-01_Screenshot_SongSelection.png b/img/posts/release-01_Screenshot_SongSelection.png new file mode 100644 index 00000000..170e7ec7 Binary files /dev/null and b/img/posts/release-01_Screenshot_SongSelection.png differ diff --git a/img/posts/release-01_Screenshot_SongSelection_Small.png b/img/posts/release-01_Screenshot_SongSelection_Small.png new file mode 100644 index 00000000..c716204c Binary files /dev/null and b/img/posts/release-01_Screenshot_SongSelection_Small.png differ diff --git a/img/stamp.jpg b/img/stamp.jpg new file mode 100644 index 00000000..dc6528fb Binary files /dev/null and b/img/stamp.jpg differ