diff --git a/Gemfile b/Gemfile index dd63ab8e..80b518df 100644 --- a/Gemfile +++ b/Gemfile @@ -1,25 +1,25 @@ -source "https://rubygems.org" -ruby RUBY_VERSION - -# Hello! This is where you manage which Jekyll version is used to run. -# When you want to use a different version, change it below, save the -# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: -# -# bundle exec jekyll serve -# -# This will help ensure the proper Jekyll version is running. -# Happy Jekylling! -gem "jekyll", "3.3.1" - -# This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.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`. -# gem "github-pages", group: :jekyll_plugins - -# If you have any plugins, put them here! -group :jekyll_plugins do - gem "jekyll-feed", "~> 0.6" - gem "github-pages", "~> 111" -end +source "https://rubygems.org" +ruby RUBY_VERSION + +# Hello! This is where you manage which Jekyll version is used to run. +# When you want to use a different version, change it below, save the +# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: +# +# bundle exec jekyll serve +# +# This will help ensure the proper Jekyll version is running. +# Happy Jekylling! +gem "jekyll", "3.3.1" + +# This is the default theme for new Jekyll sites. You may change this to anything you like. +gem "minima", "~> 2.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`. +# gem "github-pages", group: :jekyll_plugins + +# If you have any plugins, put them here! +group :jekyll_plugins do + gem "jekyll-feed", "~> 0.6" + gem "github-pages", "~> 111" +end diff --git a/Gemfile.lock b/Gemfile.lock index f7a25d0c..e99949f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.0) + addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) coffee-script (2.4.1) coffee-script-source @@ -17,9 +17,10 @@ GEM ethon (0.10.1) ffi (>= 1.3.0) execjs (2.7.0) - faraday (0.10.0) + faraday (0.12.1) multipart-post (>= 1.2, < 3) - ffi (1.9.14-x64-mingw32) + ffi (1.9.18) + ffi (1.9.18-x64-mingw32) forwardable-extended (2.6.0) gemoji (2.1.0) github-pages (111) @@ -70,10 +71,10 @@ GEM octokit (~> 4.0) public_suffix (~> 2.0) typhoeus (~> 0.7) - html-pipeline (2.4.2) + html-pipeline (2.6.0) activesupport (>= 2) nokogiri (>= 1.4) - i18n (0.7.0) + i18n (0.8.4) jekyll (3.3.1) addressable (~> 2.4) colorator (~> 1.0) @@ -153,44 +154,52 @@ GEM gemoji (~> 2.0) html-pipeline (~> 2.2) jekyll (>= 3.0) - json (1.8.3) + json (1.8.6) kramdown (1.11.1) + libv8 (3.16.14.19-x86_64-linux) liquid (3.0.6) listen (3.0.6) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9.7) mercenary (0.3.6) - mini_portile2 (2.1.0) + mini_portile2 (2.2.0) minima (2.0.0) - minitest (5.10.1) + minitest (5.10.2) multipart-post (2.0.0) net-dns (0.8.0) - nokogiri (1.7.0-x64-mingw32) - mini_portile2 (~> 2.1.0) - octokit (4.6.2) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) + nokogiri (1.8.0-x64-mingw32) + mini_portile2 (~> 2.2.0) + octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.14.0) forwardable-extended (~> 2.6) - public_suffix (2.0.4) + public_suffix (2.0.5) rb-fsevent (0.9.8) - rb-inotify (0.9.7) + rb-inotify (0.9.8) ffi (>= 0.5.0) + ref (2.0.0) rouge (1.11.1) safe_yaml (1.0.4) - sass (3.4.23) + sass (3.4.24) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) - terminal-table (1.7.3) - unicode-display_width (~> 1.1.1) - thread_safe (0.3.5) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) + ref + thread_safe (0.3.6) typhoeus (0.8.0) ethon (>= 0.8.0) - tzinfo (1.2.2) + tzinfo (1.2.3) thread_safe (~> 0.1) - unicode-display_width (1.1.2) + unicode-display_width (1.2.1) PLATFORMS + ruby x64-mingw32 DEPENDENCIES @@ -198,9 +207,10 @@ DEPENDENCIES jekyll (= 3.3.1) jekyll-feed (~> 0.6) minima (~> 2.0) + therubyracer RUBY VERSION - ruby 2.2.3p173 + ruby 2.3.4p301 BUNDLED WITH - 1.13.6 + 1.15.1 diff --git a/_config.yml b/_config.yml index d37297c2..f693d531 100644 --- a/_config.yml +++ b/_config.yml @@ -47,7 +47,7 @@ faviconPng: "/img/vocaluxe_icon.png" ############################## # Color the browser elements # ############################## -color-browser: "#000000" +color-browser: "#2C3E50" apple-status-bar-style: "black" ################ @@ -75,7 +75,7 @@ pages_list: Home: 'hero-area' News: 'news' Download: 'download' - About: 'about' + Features: 'about' Help: 'help' Contribute: 'contribute' Songs: 'songs' diff --git a/_data/features.json b/_data/features.json index d15afe3d..35fc02aa 100644 --- a/_data/features.json +++ b/_data/features.json @@ -24,7 +24,7 @@ "description": "Singing is even more fun when you can see yourself - Vocaluxe supports webcams. You can also use it to take pictures for the player profiles." }, { - "title": "GamePad and WiiMote", + "title": "GamePad & WiiMote", "image": "controller.png", "description": "Besides keyboard and mouse Vocaluxe has build-in support for GamePads and WiiMote" }, @@ -39,7 +39,7 @@ "description": "Vocaluxe can play any song in the widely used UltraStar format. Choose from thousands of songs available online." }, { - "title": "Multi-language support", + "title": "Multi-Language", "image": "translations.png", "description": "Vocaluxe supports many different languages - If your language isn't available just start translating it!" } diff --git a/_data/songs.json b/_data/songs.json index 4c872f4c..df768f66 100644 --- a/_data/songs.json +++ b/_data/songs.json @@ -1,14 +1,14 @@ [{ "title": "Download", "icon": "music", - "description": "Find more than 18.000 songs on USDB, from real classics to the latest hits.", - "url_text": "usdb.animux.de", + "description": "Find more than 18.000 songs on USDB, from real classics to the latest hits on usdb.animux.de.", + "url_text": "Get Songs", "url": "http://usdb.animux.de" }, { - "title": "Create your own", + "title": "Create", "icon": "file-text-o", - "description": "Your favourite song isn't available? Just try to make your own songs for Vocaluxe.", + "description": "Your favourite song isn't available? Just try to make your own songs for Vocaluxe by following this tutorial.", "url_text": "Tutorial", "url": "http://www.ultraguide.net/songcreation.php" }] diff --git a/_includes/about.html b/_includes/about.html index c3b81ace..2324b188 100644 --- a/_includes/about.html +++ b/_includes/about.html @@ -1,25 +1,24 @@
-
-
-

{{ page.title }}

-

{{ page.subtitle }}

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

{{ feature.title }}

-

{{ feature.description }}

-
-
-
+
+
+

{{ page.title }}

+

{{ page.subtitle }}

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

{{ feature.title }}

+

{{ feature.description }}

+
- {% endfor %} +
+
+ {% endfor %}
+
diff --git a/_includes/contribute.html b/_includes/contribute.html index 65e78a57..3988f438 100644 --- a/_includes/contribute.html +++ b/_includes/contribute.html @@ -6,11 +6,24 @@ {{ page.content | markdownify }}
{% for contribute in site.data.contribute %} -
-

{{ contribute.title }}

- -

{{ contribute.description }}

-

{{ contribute.url_text }}

+
+
+
+ +
+
+

{{ contribute.title }}

+

{{ contribute.description }}

+
+
+
+
+
+

+

{{ contribute.url_text }}

+
+
+
{% endfor %}
diff --git a/_includes/download.html b/_includes/download.html index f6d83b1e..6b9ea6b4 100644 --- a/_includes/download.html +++ b/_includes/download.html @@ -15,56 +15,53 @@

{{ 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.

+

+ 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. +

-
+

Nightly

A version with all the newest development changes. Likely to contain bugs, so use with caution.

{% if release_nightly != nil %} -

Latest update: {{ release_nightly.created_at | date: "%Y-%m-%d" }} -
- Read our release notes on GitHub.

{% for asset in release_nightly.assets %} {% assign currentReleaseData = asset.name | split:".zip" | first | split:"_" %} - {% assign currentReleaseTitle = 'Vocaluxe ' | append: currentReleaseData[1] %} + {% assign currentReleaseTitle = release_nightly.created_at | date: "%b %d, %Y"" %} {% assign currentReleaseOs = currentReleaseData[2] %} {% assign currentReleaseArch = currentReleaseData[3] %} {% include downloadButton.html title=currentReleaseTitle os=currentReleaseOs arch=currentReleaseArch url=asset.browser_download_url %} {% endfor %} +

{{ release_nightly.created_at | date: "%Y-%m-%d" }} | GitHub

{% else %}

There isn't any nightly release yet.

{% endif %}
-
+

Pre Release

Should be almost stable, but you might experience some bugs here.

{% if release_pre != nil %} -

Latest version: {{release_pre.name}} ({{ release_pre.created_at | date: "%Y-%m-%d" }}) -
- Read our release notes on GitHub.

{% for asset in release_pre.assets %} {% assign currentReleaseData = asset.name | split:".zip" | first | split:"_" %} - {% assign currentReleaseTitle = 'Vocaluxe ' | append: release_pre.name %} + {% assign currentReleaseTitle = release_pre.name %} {% assign currentReleaseOs = currentReleaseData[2] %} {% assign currentReleaseArch = currentReleaseData[3] %} {% include downloadButton.html title=currentReleaseTitle os=currentReleaseOs arch=currentReleaseArch url=asset.browser_download_url %} {% endfor %} +

{{ release_pre.created_at | date: "%Y-%m-%d" }} | GitHub

{% else %}

There isn't any pre release yet.

{% endif %}
-
+

Stable Release

The latest release.

{% if release_stable != nil %} -

Latest version: {{release_stable.name}} ({{ release_stable.created_at | date: "%Y-%m-%d" }}) -
- Read our release notes on GitHub.

{% for asset in release_stable.assets %} {% assign currentReleaseData = asset.name | split:".zip" | first | split:"_" %} {% assign currentReleaseTitle = 'Vocaluxe ' | append: release_stable.name %} @@ -72,7 +69,8 @@ {% assign currentReleaseArch = currentReleaseData[3] %} {% include downloadButton.html title=currentReleaseTitle os=currentReleaseOs arch=currentReleaseArch url=asset.browser_download_url %} {% endfor %} - + +

{{ release_stable.created_at | date: "%Y-%m-%d" }} | GitHub

{% else %}

There isn't any stable release yet.

{% endif %} diff --git a/_includes/downloadButton.html b/_includes/downloadButton.html index 394c6283..0db3dccc 100644 --- a/_includes/downloadButton.html +++ b/_includes/downloadButton.html @@ -5,8 +5,9 @@ {% endif %} {% if include.arch == "x86" %} - {{include.title}} + {{include.title}} (x86) {% else %} - {{include.title}} - {% endif %} - \ No newline at end of file + {{include.title}} (x64) + {% endif %} + +
diff --git a/_includes/footer.html b/_includes/footer.html new file mode 100644 index 00000000..4ff61d93 --- /dev/null +++ b/_includes/footer.html @@ -0,0 +1,34 @@ + + + + + diff --git a/_includes/head.html b/_includes/head.html index 201b1c6e..d632378c 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -7,14 +7,14 @@ {{site.title}}{% if page.title %} | {{page.title}}{% endif %} - + {% if site.favicon %} {% endif %} - + @@ -23,7 +23,7 @@ - + @@ -35,12 +35,12 @@ - + - + {% include color-browser.html %} diff --git a/_includes/help.html b/_includes/help.html index bc66e6c4..e2baf43e 100644 --- a/_includes/help.html +++ b/_includes/help.html @@ -6,11 +6,24 @@

{{ page.content | markdownify }}

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

{{ help.title }}

- -

{{ help.description }}

-

{{ help.url_text }}

+
+
+
+ +
+
+

{{ help.title }}

+

{{ help.description }}

+
+
+
+
+
+

+

{{ help.url_text }}

+
+
+
{% endfor %}
diff --git a/_includes/hero_area.html b/_includes/hero_area.html index f23a3f90..2968df7b 100644 --- a/_includes/hero_area.html +++ b/_includes/hero_area.html @@ -4,16 +4,16 @@
-

{{site.title}}

-

{{site.subtitle}}

- - -
-

{{ site.description }}

- Download Now! - Learn More +
+

{{site.title}}

+

{{site.subtitle}}

+

{{ site.description }}

+ Download Now! + Learn More
+ +
diff --git a/_includes/navigation.html b/_includes/navigation.html index 5e2a9236..2ad536ff 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -1,6 +1,6 @@
-