From 06826b12df36e75095a72863efd0d6f99062f6e7 Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Sat, 27 May 2017 12:17:34 +0200 Subject: [PATCH] - Align "three-column"-sections (vertical) - Convert all remaining tabs to four spaces --- Gemfile.lock | 2 +- _includes/about.html | 40 ++++++++++---------- _includes/contribute.html | 30 ++++++++------- _includes/download.html | 22 +++++------ _includes/head.html | 68 +++++++++++++++++----------------- _includes/help.html | 30 ++++++++------- _includes/hero_area.html | 28 +++++++------- _includes/hero_area_small.html | 16 ++++---- _includes/navigation.html | 62 +++++++++++++++---------------- _includes/news.html | 56 ++++++++++++++-------------- _includes/songs.html | 30 ++++++++------- _layouts/index.html | 28 +++++++------- _layouts/post.html | 28 +++++++------- css/main.css | 5 +++ 14 files changed, 228 insertions(+), 217 deletions(-) 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 4a5a607a..74df664c 100644 --- a/_includes/news.html +++ b/_includes/news.html @@ -3,14 +3,14 @@ {% 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 }}

- +
+
+

{{ 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 @@ -20,14 +20,14 @@ 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 '' %} +
+ {% 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 %} @@ -36,13 +36,13 @@ 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 '' %} +
+ {% 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 %} @@ -51,10 +51,10 @@ read more {% endif %} {% endif %} -
- {% endif %} -
-
-
+
+ {% endif %} +
+
+
diff --git a/_includes/songs.html b/_includes/songs.html index 07a8432d..525ffedc 100644 --- a/_includes/songs.html +++ b/_includes/songs.html @@ -1,18 +1,20 @@
-
-
-

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

+
+ {% 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/css/main.css b/css/main.css index c68148fa..0922d1ba 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; }