Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Align "three-column"-sections (vertical)

Browse Source 
- Convert all remaining tabs to four spaces
This commit is contained in:
lukeIam committed 2017-05-27 12:17:34 +02:00
1 parent 86d2b16dae
commit 06826b12df
14 files changed
+217 -206
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Gemfile.lock
+1 -1
View File
@@ -200,7 +200,7 @@ DEPENDENCIES
minima (~> 2.0) minima (~> 2.0)
RUBY VERSION RUBY VERSION
ruby 2.3.3p222 ruby 2.2.3p173
BUNDLED WITH BUNDLED WITH
1.13.6 1.13.6
_includes/about.html
+20 -20
View File
@@ -1,25 +1,25 @@
<!-- About Section --> <!-- About Section -->
<section id="{{ page.section-type }}"> <section id="{{ page.section-type }}">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<h1 class="title">{{ page.title }}</h1> <h1 class="title">{{ page.title }}</h1>
<h2 class="subtitle">{{ page.subtitle }}</h2> <h2 class="subtitle">{{ page.subtitle }}</h2>
{% for feature in site.data.features %} {% for feature in site.data.features %}
<div class="col-md-3 col-sm-6"> <div class="col-md-3 col-sm-6">
<div class="feature"> <div class="feature">
<img src="{{site.baseurl}}/img/features/{{ feature.image }}" class="img-responsive" alt=""> <img src="{{site.baseurl}}/img/features/{{ feature.image }}" class="img-responsive" alt="">
<div class="caption"> <div class="caption">
<div class="blur"></div> <div class="blur"></div>
<div class="caption-text"> <div class="caption-text">
<h4>{{ feature.title }}</h4> <h4>{{ feature.title }}</h4>
<p>{{ feature.description }}</p> <p>{{ feature.description }}</p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
</section> </section>
<!-- About Section End --> <!-- About Section End -->
_includes/contribute.html
+16 -14
View File
@@ -1,18 +1,20 @@
<!-- Contribute Section --> <!-- Contribute Section -->
<section id="{{ page.section-type }}" class="content-section"> <section id="{{ page.section-type }}" class="content-section">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<h1 class="title">{{ page.title }}</h1> <h1 class="title">{{ page.title }}</h1>
{{ page.content | markdownify }} {{ page.content | markdownify }}
{% for contribute in site.data.contribute %} <div class="flex-box-row">
<div class="col-md-4"> {% for contribute in site.data.contribute %}
<h2>{{ contribute.title }}</h2> <div class="col-md-4 flex-box-col">
<span class="contribute-icon fa fa-{{ contribute.icon }}" aria-hidden="true"></span> <h2 class="flex00a">{{ contribute.title }}</h2>
<p>{{ contribute.description }}</p> <span class="contribute-icon fa fa-{{ contribute.icon }} flex00a" aria-hidden="true"></span>
<p><a class="btn" href="{{ contribute.url }}">{{ contribute.url_text }}</a></p> <p class="flex11100">{{ contribute.description }}</p>
</div> <p><a class="btn flex00a" href="{{ contribute.url }}">{{ contribute.url_text }}</a></p>
{% endfor %} </div>
</div> {% endfor %}
</div> </div>
</div>
</div>
</section> </section>
<!-- Contribute Section End --> <!-- Contribute Section End -->
_includes/download.html
+10 -10
View File
@@ -4,16 +4,16 @@
{% assign release_stable = nil %} {% assign release_stable = nil %}
{% for release in site.github.releases %} {% for release in site.github.releases %}
{% if release.tag_name == "Nightly" %} {% if release.tag_name == "Nightly" %}
{% assign release_nightly = release %} {% assign release_nightly = release %}
{% elsif release.prerelease == true and (release_pre == nil or release.created_at > release_pre.created_at) %} {% elsif release.prerelease == true and (release_pre == nil or release.created_at > release_pre.created_at) %}
{% assign release_pre = release %} {% assign release_pre = release %}
{% elsif release_stable == nil or release.created_at > release_stable.created_at %} {% elsif release_stable == nil or release.created_at > release_stable.created_at %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<section id="{{ page.section-type }}" class="content-section"> <section id="{{ page.section-type }}" class="content-section">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<h1 class="title">{{ page.title }}</h1> <h1 class="title">{{ page.title }}</h1>
<p>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 <a href="https://github.com/Vocaluxe/Vocaluxe/blob/develop/HowToBuildLinux.md">compile Vocaluxe yourself</a> (for advanced users). If you're looking for some older versions, check out our releases on <a href="https://github.com/Vocaluxe/Vocaluxe/releases">GitHub</a> and <a href="https://sourceforge.net/projects/vocaluxe/files/?source=directory">Sourceforge</a>.</p> <p>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 <a href="https://github.com/Vocaluxe/Vocaluxe/blob/develop/HowToBuildLinux.md">compile Vocaluxe yourself</a> (for advanced users). If you're looking for some older versions, check out our releases on <a href="https://github.com/Vocaluxe/Vocaluxe/releases">GitHub</a> and <a href="https://sourceforge.net/projects/vocaluxe/files/?source=directory">Sourceforge</a>.</p>
<div class="release-section"> <div class="release-section">
@@ -78,7 +78,7 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
<!-- Download Section End --> <!-- Download Section End -->
_includes/head.html
+30 -30
View File
@@ -1,46 +1,46 @@
<!-- HEAD Start --> <!-- HEAD Start -->
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="{{site.description}}"> <meta name="description" content="{{site.description}}">
<meta name="author" content="{{site.author}}"> <meta name="author" content="{{site.author}}">
<meta name="keywords" content="{{site.keywords}}"> <meta name="keywords" content="{{site.keywords}}">
<link rel="canonical" href="{{page.url | replace:'index.html','' | prepend: site.baseurl}}"> <link rel="canonical" href="{{page.url | replace:'index.html','' | prepend: site.baseurl}}">
<title>{{site.title}}{% if page.title %} | {{page.title}}{% endif %}</title> <title>{{site.title}}{% if page.title %} | {{page.title}}{% endif %}</title>
{% if site.favicon %} {% if site.favicon %}
<link rel="shortcut icon" type="image/x-icon" href="{{site.baseurl}}{{site.favicon}}"> <link rel="shortcut icon" type="image/x-icon" href="{{site.baseurl}}{{site.favicon}}">
{% endif %} {% endif %}
<!-- Bootstrap --> <!-- Bootstrap -->
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="{{site.baseurl}}/css/bootstrap.min.css">
<!-- Main Style --> <!-- Main Style -->
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/css/main.css"> <link rel="stylesheet" type="text/css" href="{{site.baseurl}}/css/main.css">
<!-- Responsive Style --> <!-- Responsive Style -->
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/css/responsive.css"> <link rel="stylesheet" type="text/css" href="{{site.baseurl}}/css/responsive.css">
<!--Icon Fonts--> <!--Icon Fonts-->
<link rel="stylesheet" media="screen" href="{{site.baseurl}}/fonts/font-awesome/font-awesome.min.css" /> <link rel="stylesheet" media="screen" href="{{site.baseurl}}/fonts/font-awesome/font-awesome.min.css" />
<!--Arch Icon Fonts--> <!--Arch Icon Fonts-->
<link rel="stylesheet" media="screen" href="{{site.baseurl}}/fonts/font-arch/arch.min.css" /> <link rel="stylesheet" media="screen" href="{{site.baseurl}}/fonts/font-arch/arch.min.css" />
<!-- Extras --> <!-- Extras -->
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/extras/animate.css"> <link rel="stylesheet" type="text/css" href="{{site.baseurl}}/extras/animate.css">
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/extras/lightbox.css"> <link rel="stylesheet" type="text/css" href="{{site.baseurl}}/extras/lightbox.css">
<!-- jQuery Load --> <!-- jQuery Load -->
<script src="{{site.baseurl}}/js/jquery-min.js"></script> <script src="{{site.baseurl}}/js/jquery-min.js"></script>
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]--> <![endif]-->
{% include color-browser.html %} {% include color-browser.html %}
</head> </head>
<!-- HEAD End --> <!-- HEAD End -->
_includes/help.html
+16 -14
View File
@@ -1,18 +1,20 @@
<!-- Help Section --> <!-- Help Section -->
<section id="{{ page.section-type }}" class="content-section"> <section id="{{ page.section-type }}" class="content-section">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<h1 class="title">{{ page.title }}</h1> <h1 class="title">{{ page.title }}</h1>
<p style="text-align:center">{{ page.content | markdownify }}</p> <p style="text-align:center">{{ page.content | markdownify }}</p>
{% for help in site.data.help %} <div class="flex-box-row">
<div class="col-md-4"> {% for help in site.data.help %}
<h2>{{ help.title }}</h2> <div class="col-md-4 flex-box-col">
<span class="contribute-icon fa fa-{{ help.icon }}" aria-hidden="true"></span> <h2 class="flex00a">{{ help.title }}</h2>
<p>{{ help.description }}</p> <span class="contribute-icon fa fa-{{ help.icon }} flex00a" aria-hidden="true"></span>
<p><a class="btn" href="{{ help.url }}">{{ help.url_text }}</a></p> <p class="flex11100">{{ help.description }}</p>
</div> <p><a class="btn flex00a" href="{{ help.url }}">{{ help.url_text }}</a></p>
{% endfor %} </div>
</div> {% endfor %}
</div> </div>
</div>
</div>
</section> </section>
<!-- Help Section End --> <!-- Help Section End -->
_includes/hero_area.html
+14 -14
View File
@@ -1,22 +1,22 @@
<!-- Hero Area Section --> <!-- Hero Area Section -->
<section id="hero-area"> <section id="hero-area">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1 class="title">{{site.title}}</h1> <h1 class="title">{{site.title}}</h1>
<h2 class="subtitle">{{site.subtitle}}</h2> <h2 class="subtitle">{{site.subtitle}}</h2>
<img class="col-md-6 col-sm-6 col-xs-12 animated fadeInLeft" src="{{site.baseurl}}/img/screenshot_sing.png" alt=""> <img class="col-md-6 col-sm-6 col-xs-12 animated fadeInLeft" src="{{site.baseurl}}/img/screenshot_sing.png" alt="">
<div class="col-md-6 col-sm-6 col-xs-12 animated fadeInRight delay-0-5"> <div class="col-md-6 col-sm-6 col-xs-12 animated fadeInRight delay-0-5">
<p>{{ site.description }}</p> <p>{{ site.description }}</p>
<a href="#download" class="btn btn-common btn-lg">Download Now!</a> <a href="#download" class="btn btn-common btn-lg">Download Now!</a>
<a href="#about" class="btn btn-primary btn-lg">Learn More</a> <a href="#about" class="btn btn-primary btn-lg">Learn More</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
<!-- Hero Area Section End--> <!-- Hero Area Section End-->
_includes/hero_area_small.html
+8 -8
View File
@@ -1,14 +1,14 @@
<!-- Hero Area Section --> <!-- Hero Area Section -->
<section id="hero-area"> <section id="hero-area">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1 class="title">{{site.title}}</h1> <h1 class="title">{{site.title}}</h1>
<h2 class="subtitle">{{site.subtitle}}</h2> <h2 class="subtitle">{{site.subtitle}}</h2>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
<!-- Hero Area Section End--> <!-- Hero Area Section End-->
_includes/navigation.html
+31 -31
View File
@@ -11,47 +11,47 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
{% if page.section-type == "index" %} {% if page.section-type == "index" %}
<a class="navbar-brand" href="#hero-area"> <a class="navbar-brand" href="#hero-area">
{% else %} {% else %}
<a class="navbar-brand" href="{{site.baseurl}}/"> <a class="navbar-brand" href="{{site.baseurl}}/">
{% endif %} {% endif %}
<div> <div>
{% if site.faviconPng %} {% if site.faviconPng %}
<img class="faviconPng" width="25" height=25" src="{{site.baseurl}}{{ site.faviconPng }}" alt=""> <img class="faviconPng" width="25" height=25" src="{{site.baseurl}}{{ site.faviconPng }}" alt="">
{% endif %} {% endif %}
{{ site.title }} {{ site.title }}
</div> </div>
</a> </a>
</div> </div>
<div class="collapse navbar-collapse" id="navbar"> <div class="collapse navbar-collapse" id="navbar">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
{% if page.section-type == "index" %} {% if page.section-type == "index" %}
<!-- Scroll to section for each page in index --> <!-- Scroll to section for each page in index -->
{% for p in site.pages_list %} {% for p in site.pages_list %}
<li> <li>
<a href="#{{ p[1] }}"> {{p[0]}} </a> <a href="#{{ p[1] }}"> {{p[0]}} </a>
</li> </li>
{% endfor %} {% endfor %}
{% else %} {% else %}
<!-- Blog, Post, Tag and Error pages --> <!-- Blog, Post, Tag and Error pages -->
{% for p in site.pages_list %} {% for p in site.pages_list %}
<li> <li>
{% if p[1] == "latest-post" %} {% if p[1] == "latest-post" %}
{% if page.url == "/blog/index.html" | prepend: {{site.baseurl}} %} {% if page.url == "/blog/index.html" | prepend: {{site.baseurl}} %}
<a href="#page"> {{p[0]}} </a> <a href="#page"> {{p[0]}} </a>
{% else %} {% else %}
<a href="{{site.baseurl}}/blog/"> {{p[0]}} </a> <a href="{{site.baseurl}}/blog/"> {{p[0]}} </a>
{% endif %} {% endif %}
{% else %} {% else %}
<a href="{{site.baseurl}}/#{{ p[1] }}"> {{p[0]}} </a> <a href="{{site.baseurl}}/#{{ p[1] }}"> {{p[0]}} </a>
{% endif %} {% endif %}
</li> </li>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
</div> </div>
</nav> </nav>
_includes/news.html
+28 -28
View File
@@ -3,14 +3,14 @@
{% assign post_2 = site.posts[1] %} {% assign post_2 = site.posts[1] %}
{% assign post_3 = site.posts[2] %} {% assign post_3 = site.posts[2] %}
<section id="{{ page.section-type }}"> <section id="{{ page.section-type }}">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<h1 class="title">{{ page.title }}</h1> <h1 class="title">{{ page.title }}</h1>
{% if post_1 != nil %} {% if post_1 != nil %}
<div class="col-md-8"> <div class="col-md-8">
<h2><a href="{{site.baseurl}}{{ post_1.url }}">{{post_1.title}} </a></h2> <h2><a href="{{site.baseurl}}{{ post_1.url }}">{{post_1.title}} </a></h2>
<p>Published on {{ post_1.date | date: "%Y-%m-%d"}} by {{ post_1.author }}</p> <p>Published on {{ post_1.date | date: "%Y-%m-%d"}} by {{ post_1.author }}</p>
<img src="{{site.baseurl}}/img/posts/{{ post_1.image }}" class="img-responsive" /> <img src="{{site.baseurl}}/img/posts/{{ post_1.image }}" class="img-responsive" />
{% if post_1.content contains '<!--more-big-->' %} {% if post_1.content contains '<!--more-big-->' %}
{{ post_1.content | split:'<!--more-big-->' | first | markdownify}} {{ post_1.content | split:'<!--more-big-->' | first | markdownify}}
<a href="{{site.baseurl}}{{ post_1.url }}">read more</a> <a href="{{site.baseurl}}{{ post_1.url }}">read more</a>
@@ -20,14 +20,14 @@
<a href="{{site.baseurl}}{{ post_1.url }}">read more</a> <a href="{{site.baseurl}}{{ post_1.url }}">read more</a>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
<div class="col-md-4"> <div class="col-md-4">
{% if post_2 != nil %} {% if post_2 != nil %}
<div class="col-lg-12"> <div class="col-lg-12">
<h3><a href="{{site.baseurl}}{{ post_2.url }}">{{ post_2.title }}</a></h3> <h3><a href="{{site.baseurl}}{{ post_2.url }}">{{ post_2.title }}</a></h3>
<p>Published on {{ post_2.date | date: "%Y-%m-%d"}} by {{ post_2.author }}</p> <p>Published on {{ post_2.date | date: "%Y-%m-%d"}} by {{ post_2.author }}</p>
{% if post_2.content contains '<!--more-->' %} {% if post_2.content contains '<!--more-->' %}
{{ post_2.content | split:'<!--more-->' | first | markdownify}} {{ post_2.content | split:'<!--more-->' | first | markdownify}}
<a href="{{site.baseurl}}{{ post_2.url }}">read more</a> <a href="{{site.baseurl}}{{ post_2.url }}">read more</a>
{% else %} {% else %}
@@ -36,13 +36,13 @@
<a href="{{site.baseurl}}{{ post_2.url }}">read more</a> <a href="{{site.baseurl}}{{ post_2.url }}">read more</a>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
{% if post_3 != nil %} {% if post_3 != nil %}
<div class="col-lg-12"> <div class="col-lg-12">
<h3><a href="{{site.baseurl}}{{ post_3.url }}">{{ post_3.title }}</a></h3> <h3><a href="{{site.baseurl}}{{ post_3.url }}">{{ post_3.title }}</a></h3>
<p>Published on {{ post_3.date | date: "%Y-%m-%d"}} by {{ post_3.author }}</p> <p>Published on {{ post_3.date | date: "%Y-%m-%d"}} by {{ post_3.author }}</p>
{% if post_3.content contains '<!--more-->' %} {% if post_3.content contains '<!--more-->' %}
{{ post_3.content | split:'<!--more-->' | first | markdownify}} {{ post_3.content | split:'<!--more-->' | first | markdownify}}
<a href="{{site.baseurl}}{{ post_3.url }}">read more</a> <a href="{{site.baseurl}}{{ post_3.url }}">read more</a>
{% else %} {% else %}
@@ -51,10 +51,10 @@
<a href="{{site.baseurl}}{{ post_3.url }}">read more</a> <a href="{{site.baseurl}}{{ post_3.url }}">read more</a>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>
</section> </section>
<!-- Help Section End --> <!-- Help Section End -->
_includes/songs.html
+16 -14
View File
@@ -1,18 +1,20 @@
<!-- Songs Section --> <!-- Songs Section -->
<section id="{{ page.section-type }}" class="content-section"> <section id="{{ page.section-type }}" class="content-section">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<h1 class="title">{{ page.title }}</h1> <h1 class="title">{{ page.title }}</h1>
{{ page.content | markdownify }} {{ page.content | markdownify }}
{% for song in site.data.songs %} <div class="flex-box-row">
<div class="col-md-6"> {% for song in site.data.songs %}
<h2>{{ song.title }}</h2> <div class="col-md-6 flex-box-col" >
<span class="contribute-icon fa fa-{{ song.icon }}" aria-hidden="true"></span> <h2 class="flex00a">{{ song.title }}</h2>
<p>{{ song.description }}</p> <span class="contribute-icon fa fa-{{ song.icon }} flex00a" aria-hidden="true"></span>
<p><a class="btn" href="{{ song.url }}">{{ song.url_text }}</a></p> <p class="flex11100">{{ song.description }}</p>
</div> <p><a class="btn flex00a" href="{{ song.url }}">{{ song.url_text }}</a></p>
{% endfor %} </div>
</div> {% endfor %}
</div> </div>
</div>
</div>
</section> </section>
<!-- Songs Section End --> <!-- Songs Section End -->
_layouts/index.html
+10 -10
View File
@@ -8,19 +8,19 @@
<body data-spy="scroll" data-offset="20" data-target="#navbar"> <body data-spy="scroll" data-offset="20" data-target="#navbar">
{% include navigation.html %} {% include navigation.html %}
{% include hero_area.html %} {% include hero_area.html %}
{% for p in site.pages_list %} {% for p in site.pages_list %}
{% for page in site.pages %} {% for page in site.pages %}
{% if p[1] == page.section-type %} {% if p[1] == page.section-type %}
{% include {{ page.path }} %} {% include {{ page.path }} %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% include js.html %} {% include js.html %}
</body> </body>
</html> </html>
_layouts/post.html
+12 -12
View File
@@ -7,21 +7,21 @@
<body data-spy="scroll" data-offset="20" data-target="#navbar"> <body data-spy="scroll" data-offset="20" data-target="#navbar">
{% include navigation.html %} {% include navigation.html %}
{% include hero_area_small.html %} {% include hero_area_small.html %}
<section id="{{ page.section-type }}"> <section id="{{ page.section-type }}">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<h1 class="title">{{page.title}}</h1> <h1 class="title">{{page.title}}</h1>
<h4>Published on {{ page.date | date: "%Y-%m-%d"}} by {{ page.author }}</h4> <h4>Published on {{ page.date | date: "%Y-%m-%d"}} by {{ page.author }}</h4>
<img src="{{site.baseurl}}/img/posts/{{ page.image }}" class="img-responsive" /> <img src="{{site.baseurl}}/img/posts/{{ page.image }}" class="img-responsive" />
{{ page.content | markdownify }} {{ page.content | markdownify }}
</div> </div>
</div> </div>
</section> </section>
{% include js.html %} {% include js.html %}
</body> </body>
</html> </html>
css/main.css
+5
View File
@@ -377,6 +377,11 @@ a:hover {
flex-direction: column; flex-direction: column;
} }
.flex-box-row {
display:flex;
flex-direction: row;
}
.flex00a { .flex00a {
flex: 0 0 auto; flex: 0 0 auto;
} }