From 583f0bd6abdda17b7241bc9fee8559da27ae3543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hendrik=20Bl=C3=B6=C3=9F?= Date: Wed, 7 Jun 2017 17:52:11 +0200 Subject: [PATCH] Updated design changed a lot of things --- .gitignore | 4 + Gemfile | 25 ----- Gemfile.lock | 206 ---------------------------------- _config.yml | 4 +- _includes/download.html | 30 +++-- _includes/downloadButton.html | 9 +- _includes/hero_area.html | 16 +-- _includes/navigation.html | 2 +- css/main.css | 182 +++++++++++++++++++++--------- 9 files changed, 165 insertions(+), 313 deletions(-) delete mode 100644 Gemfile delete mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index 5c91b60c..0fdf7b2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ _site/ .sass-cache/ .jekyll-metadata + +Gemfile + +Gemfile\.lock diff --git a/Gemfile b/Gemfile deleted file mode 100644 index dd63ab8e..00000000 --- a/Gemfile +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index f7a25d0c..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,206 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - activesupport (4.2.7) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) - colorator (1.1.0) - ethon (0.10.1) - ffi (>= 1.3.0) - execjs (2.7.0) - faraday (0.10.0) - multipart-post (>= 1.2, < 3) - ffi (1.9.14-x64-mingw32) - forwardable-extended (2.6.0) - gemoji (2.1.0) - github-pages (111) - activesupport (= 4.2.7) - github-pages-health-check (= 1.3.0) - jekyll (= 3.3.1) - jekyll-avatar (= 0.4.2) - jekyll-coffeescript (= 1.0.1) - jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.8.0) - jekyll-gist (= 1.4.0) - jekyll-github-metadata (= 2.2.0) - jekyll-mentions (= 1.2.0) - jekyll-optional-front-matter (= 0.1.2) - jekyll-paginate (= 1.1.0) - jekyll-readme-index (= 0.0.3) - jekyll-redirect-from (= 0.11.0) - jekyll-relative-links (= 0.2.1) - jekyll-sass-converter (= 1.3.0) - jekyll-seo-tag (= 2.1.0) - jekyll-sitemap (= 0.12.0) - jekyll-swiss (= 0.4.0) - jekyll-theme-architect (= 0.0.3) - jekyll-theme-cayman (= 0.0.3) - jekyll-theme-dinky (= 0.0.3) - jekyll-theme-hacker (= 0.0.3) - jekyll-theme-leap-day (= 0.0.3) - jekyll-theme-merlot (= 0.0.3) - jekyll-theme-midnight (= 0.0.3) - jekyll-theme-minimal (= 0.0.3) - jekyll-theme-modernist (= 0.0.3) - jekyll-theme-primer (= 0.1.5) - jekyll-theme-slate (= 0.0.3) - jekyll-theme-tactile (= 0.0.3) - jekyll-theme-time-machine (= 0.0.3) - jekyll-titles-from-headings (= 0.1.3) - jemoji (= 0.7.0) - kramdown (= 1.11.1) - liquid (= 3.0.6) - listen (= 3.0.6) - mercenary (~> 0.3) - minima (= 2.0.0) - rouge (= 1.11.1) - terminal-table (~> 1.4) - github-pages-health-check (1.3.0) - addressable (~> 2.3) - net-dns (~> 0.8) - octokit (~> 4.0) - public_suffix (~> 2.0) - typhoeus (~> 0.7) - html-pipeline (2.4.2) - activesupport (>= 2) - nokogiri (>= 1.4) - i18n (0.7.0) - jekyll (3.3.1) - addressable (~> 2.4) - colorator (~> 1.0) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 3.0) - mercenary (~> 0.3.3) - pathutil (~> 0.9) - rouge (~> 1.7) - safe_yaml (~> 1.0) - jekyll-avatar (0.4.2) - jekyll (~> 3.0) - jekyll-coffeescript (1.0.1) - coffee-script (~> 2.2) - jekyll-default-layout (0.1.4) - jekyll (~> 3.0) - jekyll-feed (0.8.0) - jekyll (~> 3.3) - jekyll-gist (1.4.0) - octokit (~> 4.2) - jekyll-github-metadata (2.2.0) - jekyll (~> 3.1) - octokit (~> 4.0, != 4.4.0) - jekyll-mentions (1.2.0) - activesupport (~> 4.0) - html-pipeline (~> 2.3) - jekyll (~> 3.0) - jekyll-optional-front-matter (0.1.2) - jekyll (~> 3.0) - jekyll-paginate (1.1.0) - jekyll-readme-index (0.0.3) - jekyll (~> 3.0) - jekyll-redirect-from (0.11.0) - jekyll (>= 2.0) - jekyll-relative-links (0.2.1) - jekyll (~> 3.3) - jekyll-sass-converter (1.3.0) - sass (~> 3.2) - jekyll-seo-tag (2.1.0) - jekyll (~> 3.3) - jekyll-sitemap (0.12.0) - jekyll (~> 3.3) - jekyll-swiss (0.4.0) - jekyll-theme-architect (0.0.3) - jekyll (~> 3.3) - jekyll-theme-cayman (0.0.3) - jekyll (~> 3.3) - jekyll-theme-dinky (0.0.3) - jekyll (~> 3.3) - jekyll-theme-hacker (0.0.3) - jekyll (~> 3.3) - jekyll-theme-leap-day (0.0.3) - jekyll (~> 3.3) - jekyll-theme-merlot (0.0.3) - jekyll (~> 3.3) - jekyll-theme-midnight (0.0.3) - jekyll (~> 3.3) - jekyll-theme-minimal (0.0.3) - jekyll (~> 3.3) - jekyll-theme-modernist (0.0.3) - jekyll (~> 3.3) - jekyll-theme-primer (0.1.5) - jekyll (~> 3.3) - jekyll-theme-slate (0.0.3) - jekyll (~> 3.3) - jekyll-theme-tactile (0.0.3) - jekyll (~> 3.3) - jekyll-theme-time-machine (0.0.3) - jekyll (~> 3.3) - jekyll-titles-from-headings (0.1.3) - jekyll (~> 3.3) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - jemoji (0.7.0) - activesupport (~> 4.0) - gemoji (~> 2.0) - html-pipeline (~> 2.2) - jekyll (>= 3.0) - json (1.8.3) - kramdown (1.11.1) - 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) - minima (2.0.0) - minitest (5.10.1) - 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) - sawyer (~> 0.8.0, >= 0.5.3) - pathutil (0.14.0) - forwardable-extended (~> 2.6) - public_suffix (2.0.4) - rb-fsevent (0.9.8) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - rouge (1.11.1) - safe_yaml (1.0.4) - sass (3.4.23) - 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) - typhoeus (0.8.0) - ethon (>= 0.8.0) - tzinfo (1.2.2) - thread_safe (~> 0.1) - unicode-display_width (1.1.2) - -PLATFORMS - x64-mingw32 - -DEPENDENCIES - github-pages (~> 111) - jekyll (= 3.3.1) - jekyll-feed (~> 0.6) - minima (~> 2.0) - -RUBY VERSION - ruby 2.2.3p173 - -BUNDLED WITH - 1.13.6 diff --git a/_config.yml b/_config.yml index d37297c2..52b02614 100644 --- a/_config.yml +++ b/_config.yml @@ -3,7 +3,7 @@ # NB! Set your site's url, otherwise stuff will break :) -url: "https://vocaluxe.github.io" +url: "https://hendrikbl.github.io" # If you're hosting your site at a Project repository on GitHub pages # (https://yourusername.github.io/repository-name) @@ -75,7 +75,7 @@ pages_list: Home: 'hero-area' News: 'news' Download: 'download' - About: 'about' + About: 'about' Help: 'help' Contribute: 'contribute' Songs: 'songs' diff --git a/_includes/download.html b/_includes/download.html index f6d83b1e..8b0f1bb3 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..4d193088 100644 --- a/_includes/downloadButton.html +++ b/_includes/downloadButton.html @@ -5,8 +5,9 @@ {% endif %} {% if include.arch == "x86" %} - {{include.title}} + {{include.title}} (x32) {% else %} - {{include.title}} - {% endif %} - \ No newline at end of file + {{include.title}} (x64) + {% endif %} + +
diff --git a/_includes/hero_area.html b/_includes/hero_area.html index f23a3f90..efaee16d 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..4feb3d3f 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -25,7 +25,7 @@