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
+228 -217
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)
RUBY VERSION
ruby 2.3.3p222
ruby 2.2.3p173
BUNDLED WITH
1.13.6
_includes/about.html
+20 -20
View File
@@ -1,25 +1,25 @@
<!-- About Section -->
<section id="{{ page.section-type }}">
<div class="container">
<div class="row">
<h1 class="title">{{ page.title }}</h1>
<h2 class="subtitle">{{ page.subtitle }}</h2>
<div class="container">
<div class="row">
<h1 class="title">{{ page.title }}</h1>
<h2 class="subtitle">{{ page.subtitle }}</h2>
{% for feature in site.data.features %}
<div class="col-md-3 col-sm-6">
<div class="feature">
<img src="{{site.baseurl}}/img/features/{{ feature.image }}" class="img-responsive" alt="">
<div class="caption">
<div class="blur"></div>
<div class="caption-text">
<h4>{{ feature.title }}</h4>
<p>{{ feature.description }}</p>
</div>
</div>
</div>
</div>
{% endfor %}
</div>
</div>
{% for feature in site.data.features %}
<div class="col-md-3 col-sm-6">
<div class="feature">
<img src="{{site.baseurl}}/img/features/{{ feature.image }}" class="img-responsive" alt="">
<div class="caption">
<div class="blur"></div>
<div class="caption-text">
<h4>{{ feature.title }}</h4>
<p>{{ feature.description }}</p>
</div>
</div>
</div>
</div>
{% endfor %}
</div>
</div>
</section>
<!-- About Section End -->
_includes/contribute.html
+16 -14
View File
@@ -1,18 +1,20 @@
<!-- Contribute Section -->
<section id="{{ page.section-type }}" class="content-section">
<div class="container">
<div class="row">
<h1 class="title">{{ page.title }}</h1>
{{ page.content | markdownify }}
{% for contribute in site.data.contribute %}
<div class="col-md-4">
<h2>{{ contribute.title }}</h2>
<span class="contribute-icon fa fa-{{ contribute.icon }}" aria-hidden="true"></span>
<p>{{ contribute.description }}</p>
<p><a class="btn" href="{{ contribute.url }}">{{ contribute.url_text }}</a></p>
</div>
{% endfor %}
</div>
</div>
<div class="container">
<div class="row">
<h1 class="title">{{ page.title }}</h1>
{{ page.content | markdownify }}
<div class="flex-box-row">
{% for contribute in site.data.contribute %}
<div class="col-md-4 flex-box-col">
<h2 class="flex00a">{{ contribute.title }}</h2>
<span class="contribute-icon fa fa-{{ contribute.icon }} flex00a" aria-hidden="true"></span>
<p class="flex11100">{{ contribute.description }}</p>
<p><a class="btn flex00a" href="{{ contribute.url }}">{{ contribute.url_text }}</a></p>
</div>
{% endfor %}
</div>
</div>
</div>
</section>
<!-- Contribute Section End -->
_includes/download.html
+11 -11
View File
@@ -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 %}
<section id="{{ page.section-type }}" class="content-section">
<div class="container">
<div class="row">
<div class="container">
<div class="row">
<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>
<div class="release-section">
@@ -72,13 +72,13 @@
{% assign currentReleaseArch = currentReleaseData[3] %}
{% include downloadButton.html title=currentReleaseTitle os=currentReleaseOs arch=currentReleaseArch url=asset.browser_download_url %}
{% endfor %}
</span>
</span>
{% else %}
<p class="flex11100 no-release-text">There isn't any stable release yet.</p>
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
</section>
<!-- Download Section End -->
_includes/head.html
+34 -34
View File
@@ -1,46 +1,46 @@
<!-- HEAD Start -->
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="{{site.description}}">
<meta name="author" content="{{site.author}}">
<meta name="keywords" content="{{site.keywords}}">
<link rel="canonical" href="{{page.url | replace:'index.html','' | prepend: site.baseurl}}">
<title>{{site.title}}{% if page.title %} | {{page.title}}{% endif %}</title>
{% if site.favicon %}
<link rel="shortcut icon" type="image/x-icon" href="{{site.baseurl}}{{site.favicon}}">
{% endif %}
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="{{site.description}}">
<meta name="author" content="{{site.author}}">
<meta name="keywords" content="{{site.keywords}}">
<link rel="canonical" href="{{page.url | replace:'index.html','' | prepend: site.baseurl}}">
<title>{{site.title}}{% if page.title %} | {{page.title}}{% endif %}</title>
{% if site.favicon %}
<link rel="shortcut icon" type="image/x-icon" href="{{site.baseurl}}{{site.favicon}}">
{% endif %}
<!-- Bootstrap -->
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/css/bootstrap.min.css">
<!-- Main Style -->
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/css/main.css">
<!-- Bootstrap -->
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/css/bootstrap.min.css">
<!-- Main Style -->
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/css/main.css">
<!-- Responsive Style -->
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/css/responsive.css">
<!-- Responsive Style -->
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/css/responsive.css">
<!--Icon Fonts-->
<link rel="stylesheet" media="screen" href="{{site.baseurl}}/fonts/font-awesome/font-awesome.min.css" />
<!--Icon Fonts-->
<link rel="stylesheet" media="screen" href="{{site.baseurl}}/fonts/font-awesome/font-awesome.min.css" />
<!--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 -->
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/extras/animate.css">
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/extras/lightbox.css">
<!-- Extras -->
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/extras/animate.css">
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/extras/lightbox.css">
<!-- jQuery Load -->
<script src="{{site.baseurl}}/js/jquery-min.js"></script>
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[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/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
{% include color-browser.html %}
<!-- jQuery Load -->
<script src="{{site.baseurl}}/js/jquery-min.js"></script>
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[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/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
{% include color-browser.html %}
</head>
<!-- HEAD End -->
_includes/help.html
+16 -14
View File
@@ -1,18 +1,20 @@
<!-- Help Section -->
<section id="{{ page.section-type }}" class="content-section">
<div class="container">
<div class="row">
<h1 class="title">{{ page.title }}</h1>
<p style="text-align:center">{{ page.content | markdownify }}</p>
{% for help in site.data.help %}
<div class="col-md-4">
<h2>{{ help.title }}</h2>
<span class="contribute-icon fa fa-{{ help.icon }}" aria-hidden="true"></span>
<p>{{ help.description }}</p>
<p><a class="btn" href="{{ help.url }}">{{ help.url_text }}</a></p>
</div>
{% endfor %}
</div>
</div>
<div class="container">
<div class="row">
<h1 class="title">{{ page.title }}</h1>
<p style="text-align:center">{{ page.content | markdownify }}</p>
<div class="flex-box-row">
{% for help in site.data.help %}
<div class="col-md-4 flex-box-col">
<h2 class="flex00a">{{ help.title }}</h2>
<span class="contribute-icon fa fa-{{ help.icon }} flex00a" aria-hidden="true"></span>
<p class="flex11100">{{ help.description }}</p>
<p><a class="btn flex00a" href="{{ help.url }}">{{ help.url_text }}</a></p>
</div>
{% endfor %}
</div>
</div>
</div>
</section>
<!-- Help Section End -->
_includes/hero_area.html
+14 -14
View File
@@ -1,22 +1,22 @@
<!-- Hero Area Section -->
<section id="hero-area">
<div class="container">
<div class="row">
<div class="col-md-12">
<h1 class="title">{{site.title}}</h1>
<h2 class="subtitle">{{site.subtitle}}</h2>
<div class="container">
<div class="row">
<div class="col-md-12">
<h1 class="title">{{site.title}}</h1>
<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">
<p>{{ site.description }}</p>
<a href="#download" class="btn btn-common btn-lg">Download Now!</a>
<a href="#about" class="btn btn-primary btn-lg">Learn More</a>
</div>
</div>
</div>
</div>
<div class="col-md-6 col-sm-6 col-xs-12 animated fadeInRight delay-0-5">
<p>{{ site.description }}</p>
<a href="#download" class="btn btn-common btn-lg">Download Now!</a>
<a href="#about" class="btn btn-primary btn-lg">Learn More</a>
</div>
</div>
</div>
</div>
</section>
<!-- Hero Area Section End-->
_includes/hero_area_small.html
+8 -8
View File
@@ -1,14 +1,14 @@
<!-- Hero Area Section -->
<section id="hero-area">
<div class="container">
<div class="row">
<div class="col-md-12">
<h1 class="title">{{site.title}}</h1>
<h2 class="subtitle">{{site.subtitle}}</h2>
</div>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-md-12">
<h1 class="title">{{site.title}}</h1>
<h2 class="subtitle">{{site.subtitle}}</h2>
</div>
</div>
</div>
</section>
<!-- Hero Area Section End-->
_includes/navigation.html
+31 -31
View File
@@ -11,47 +11,47 @@
<span class="icon-bar"></span>
</button>
{% if page.section-type == "index" %}
<a class="navbar-brand" href="#hero-area">
<a class="navbar-brand" href="#hero-area">
{% else %}
<a class="navbar-brand" href="{{site.baseurl}}/">
<a class="navbar-brand" href="{{site.baseurl}}/">
{% endif %}
<div>
<div>
{% 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 %}
{{ site.title }}
{{ site.title }}
</div>
</a>
</a>
</div>
<div class="collapse navbar-collapse" id="navbar">
<ul class="nav navbar-nav">
{% if page.section-type == "index" %}
<ul class="nav navbar-nav">
{% if page.section-type == "index" %}
<!-- Scroll to section for each page in index -->
{% for p in site.pages_list %}
<li>
<a href="#{{ p[1] }}"> {{p[0]}} </a>
</li>
{% endfor %}
<!-- Scroll to section for each page in index -->
{% for p in site.pages_list %}
<li>
<a href="#{{ p[1] }}"> {{p[0]}} </a>
</li>
{% endfor %}
{% else %}
<!-- Blog, Post, Tag and Error pages -->
{% for p in site.pages_list %}
<li>
{% if p[1] == "latest-post" %}
{% if page.url == "/blog/index.html" | prepend: {{site.baseurl}} %}
<a href="#page"> {{p[0]}} </a>
{% else %}
<a href="{{site.baseurl}}/blog/"> {{p[0]}} </a>
{% endif %}
{% else %}
<a href="{{site.baseurl}}/#{{ p[1] }}"> {{p[0]}} </a>
{% endif %}
</li>
{% endfor %}
{% endif %}
</ul>
{% else %}
<!-- Blog, Post, Tag and Error pages -->
{% for p in site.pages_list %}
<li>
{% if p[1] == "latest-post" %}
{% if page.url == "/blog/index.html" | prepend: {{site.baseurl}} %}
<a href="#page"> {{p[0]}} </a>
{% else %}
<a href="{{site.baseurl}}/blog/"> {{p[0]}} </a>
{% endif %}
{% else %}
<a href="{{site.baseurl}}/#{{ p[1] }}"> {{p[0]}} </a>
{% endif %}
</li>
{% endfor %}
{% endif %}
</ul>
</div>
</div>
</nav>
_includes/news.html
+28 -28
View File
@@ -3,14 +3,14 @@
{% assign post_2 = site.posts[1] %}
{% assign post_3 = site.posts[2] %}
<section id="{{ page.section-type }}">
<div class="container">
<div class="row">
<h1 class="title">{{ page.title }}</h1>
{% if post_1 != nil %}
<div class="col-md-8">
<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>
<img src="{{site.baseurl}}/img/posts/{{ post_1.image }}" class="img-responsive" />
<div class="container">
<div class="row">
<h1 class="title">{{ page.title }}</h1>
{% if post_1 != nil %}
<div class="col-md-8">
<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>
<img src="{{site.baseurl}}/img/posts/{{ post_1.image }}" class="img-responsive" />
{% if post_1.content contains '<!--more-big-->' %}
{{ post_1.content | split:'<!--more-big-->' | first | markdownify}}
<a href="{{site.baseurl}}{{ post_1.url }}">read more</a>
@@ -20,14 +20,14 @@
<a href="{{site.baseurl}}{{ post_1.url }}">read more</a>
{% endif %}
{% endif %}
</div>
{% endif %}
<div class="col-md-4">
{% if post_2 != nil %}
<div class="col-lg-12">
<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>
{% if post_2.content contains '<!--more-->' %}
</div>
{% endif %}
<div class="col-md-4">
{% if post_2 != nil %}
<div class="col-lg-12">
<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>
{% if post_2.content contains '<!--more-->' %}
{{ post_2.content | split:'<!--more-->' | first | markdownify}}
<a href="{{site.baseurl}}{{ post_2.url }}">read more</a>
{% else %}
@@ -36,13 +36,13 @@
<a href="{{site.baseurl}}{{ post_2.url }}">read more</a>
{% endif %}
{% endif %}
</div>
{% endif %}
{% if post_3 != nil %}
<div class="col-lg-12">
<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>
{% if post_3.content contains '<!--more-->' %}
</div>
{% endif %}
{% if post_3 != nil %}
<div class="col-lg-12">
<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>
{% if post_3.content contains '<!--more-->' %}
{{ post_3.content | split:'<!--more-->' | first | markdownify}}
<a href="{{site.baseurl}}{{ post_3.url }}">read more</a>
{% else %}
@@ -51,10 +51,10 @@
<a href="{{site.baseurl}}{{ post_3.url }}">read more</a>
{% endif %}
{% endif %}
</div>
{% endif %}
</div>
</div>
</div>
</div>
{% endif %}
</div>
</div>
</div>
</section>
<!-- Help Section End -->
_includes/songs.html
+16 -14
View File
@@ -1,18 +1,20 @@
<!-- Songs Section -->
<section id="{{ page.section-type }}" class="content-section">
<div class="container">
<div class="row">
<h1 class="title">{{ page.title }}</h1>
{{ page.content | markdownify }}
{% for song in site.data.songs %}
<div class="col-md-6">
<h2>{{ song.title }}</h2>
<span class="contribute-icon fa fa-{{ song.icon }}" aria-hidden="true"></span>
<p>{{ song.description }}</p>
<p><a class="btn" href="{{ song.url }}">{{ song.url_text }}</a></p>
</div>
{% endfor %}
</div>
</div>
<div class="container">
<div class="row">
<h1 class="title">{{ page.title }}</h1>
{{ page.content | markdownify }}
<div class="flex-box-row">
{% for song in site.data.songs %}
<div class="col-md-6 flex-box-col" >
<h2 class="flex00a">{{ song.title }}</h2>
<span class="contribute-icon fa fa-{{ song.icon }} flex00a" aria-hidden="true"></span>
<p class="flex11100">{{ song.description }}</p>
<p><a class="btn flex00a" href="{{ song.url }}">{{ song.url_text }}</a></p>
</div>
{% endfor %}
</div>
</div>
</div>
</section>
<!-- Songs Section End -->
_layouts/index.html
+14 -14
View File
@@ -7,20 +7,20 @@
{% include head.html %}
<body data-spy="scroll" data-offset="20" data-target="#navbar">
{% 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 %}
</body>
</html>
_layouts/post.html
+14 -14
View File
@@ -6,22 +6,22 @@
{% include head.html %}
<body data-spy="scroll" data-offset="20" data-target="#navbar">
{% include navigation.html %}
{% include hero_area_small.html %}
<section id="{{ page.section-type }}">
<div class="container">
<div class="row">
<h1 class="title">{{page.title}}</h1>
<h4>Published on {{ page.date | date: "%Y-%m-%d"}} by {{ page.author }}</h4>
<img src="{{site.baseurl}}/img/posts/{{ page.image }}" class="img-responsive" />
{{ page.content | markdownify }}
</div>
</div>
{% include navigation.html %}
{% include hero_area_small.html %}
<section id="{{ page.section-type }}">
<div class="container">
<div class="row">
<h1 class="title">{{page.title}}</h1>
<h4>Published on {{ page.date | date: "%Y-%m-%d"}} by {{ page.author }}</h4>
<img src="{{site.baseurl}}/img/posts/{{ page.image }}" class="img-responsive" />
{{ page.content | markdownify }}
</div>
</div>
</section>
{% include js.html %}
{% include js.html %}
</body>
</html>
css/main.css
+5
View File
@@ -377,6 +377,11 @@ a:hover {
flex-direction: column;
}
.flex-box-row {
display:flex;
flex-direction: row;
}
.flex00a {
flex: 0 0 auto;
}