Skip to content
This repository has been archived by the owner on Jul 29, 2022. It is now read-only.

Commit

Permalink
Merge pull request #27 from s0nea/layout-fix
Browse files Browse the repository at this point in the history 
Move head element to `default.html`
  • Loading branch information
@l-mb
l-mb authored Apr 23, 2021
2 parents d0f6635 + f1e02b0 commit a75d5b2
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 108 deletions.
57 changes: 17 additions & 40 deletions _includes/footer.html
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,20 @@

<footer class="site-footer h-card">
<data class="u-url" href="{{ "/" | relative_url }}"></data>

<html>
<head>
<style>
{
box-sizing: border-box;
}
/* Set additional styling options for the columns*/
.column {
float: left;
width: 50%;
}
.row:after {
content: "";
display: table;
clear: both;
}
</style>
</head>
<body>
<div class="row">
<div class="column" align="center">
<p>{{ site.description | escape }}</p>
<br>
<a href="https://creativecommons.org/licenses/by-sa/4.0/">
<img src="{{site.baseurl}}/images/License-CC BY--SA 4.0-lightgrey.svg" alt="CC BY SA 4.0" />
</a>
</div>
<div class="column" align="center">
<a href="https://join.slack.com/t/aquaristlabs/shared_invite/zt-nphn0jhg-QYKw__It8JPMkUR_sArOug">
<img src="{{site.baseurl}}/images/social-media-icon-slack.svg" alt="Join us on Slack!" width="60" height="60"/>
</a>
<a href="https://github.com/aquarist-labs/aquarium">
<img src="{{site.baseurl}}/images/GitHub-Mark-32px.png" alt="GitHub"/>
</a>
</div>
</body>
</html>

<div class="row">
<div class="column" align="center">
<p>{{ site.description | escape }}</p>
<br>
<a href="https://creativecommons.org/licenses/by-sa/4.0/">
<img src="{{site.baseurl}}/images/License-CC BY--SA 4.0-lightgrey.svg" alt="CC BY SA 4.0" />
</a>
</div>
<div class="column" align="center">
<a href="https://join.slack.com/t/aquaristlabs/shared_invite/zt-nphn0jhg-QYKw__It8JPMkUR_sArOug">
<img src="{{site.baseurl}}/images/social-media-icon-slack.svg" alt="Join us on Slack!" width="60" height="60"/>
</a>
<a href="https://github.com/aquarist-labs/aquarium">
<img src="{{site.baseurl}}/images/GitHub-Mark-32px.png" alt="GitHub"/>
</a>
</div>
</div>
</footer>
18 changes: 17 additions & 1 deletion _layouts/default.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
<!DOCTYPE html>
<html lang="{{ page.lang | default: site.lang | default: "en" }}">

<head>
<style>
{
box-sizing: border-box;
}
/* Set additional styling options for the columns*/
.column {
float: left;
width: 50%;
}
.row:after {
content: "";
display: table;
clear: both;
}
</style>
</head>
{%- include head.html -%}

<body>
Expand Down
110 changes: 43 additions & 67 deletions _layouts/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,87 +3,65 @@
---

<div class="home">
{%- if page.title -%}
<h1 class="page-heading">{{ page.title }}</h1>
{%- endif -%}

{{ content }}
{%- if page.title -%}
<h1 class="page-heading">{{ page.title }}</h1>
{%- endif -%}

{% if site.paginate %}
{% assign posts = paginator.posts %}
{% assign minutes = paginator.minutes %}
{% else %}
{% assign posts = site.posts %}
{% assign minutes = site.minutes %}
{% endif %}
{{ content }}

<html>
<head>
<style>
{
box-sizing: border-box;
}
/* Set additional styling options for the columns*/
.column {
float: left;
width: 50%;
}
{% if site.paginate %}
{% assign posts = paginator.posts %}
{% assign minutes = paginator.minutes %}
{% else %}
{% assign posts = site.posts %}
{% assign minutes = site.minutes %}
{% endif %}

.row:after {
content: "";
display: table;
clear: both;
}
</style>
</head>
<body>
<div class="row">
<div class="column" align="left">
{%- if posts.size > 0 -%}
{%- if page.list_title -%}
<h2 class="post-list-heading">{{ page.list_title }}</h2>
{%- endif -%}
<ul class="post-list">
{%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%}
{%- for post in posts -%}
<li>
<span class="post-meta">{{ post.date | date: date_format }}</span>
<h3>
<a class="post-link" href="{{ post.url | relative_url }}">
{{ post.title | escape }}
</a>
</h3>
{%- if site.show_excerpts -%}
{{ post.excerpt }}
{%- endif -%}
</li>
{%- endfor -%}
</ul>
</div>
<div class="column" align="left">
{%- if minutes.size > 0 -%}
<h2 class="post-list-heading">Meeting minutes</h2>
<div class="row">
<div class="column" align="left">
{%- if posts.size > 0 -%}
{%- if page.list_title -%}
<h2 class="post-list-heading">{{ page.list_title }}</h2>
{%- endif -%}
<ul class="post-list">
{%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%}
{%- for minutes in minutes -%}
{%- for post in posts -%}
<li>
<span class="post-meta">{{ minutes.date | date: date_format }}</span>
<span class="post-meta">{{ post.date | date: date_format }}</span>
<h3>
<a class="post-link" href="{{ minutes.url | relative_url }}">
{{ minutes.title | escape }}
<a class="post-link" href="{{ post.url | relative_url }}">
{{ post.title | escape }}
</a>
</h3>
{%- if site.show_excerpts -%}
{{ minutes.excerpt }}
{{ post.excerpt }}
{%- endif -%}
</li>
{%- endfor -%}
</ul>
</div>
</div>
</body>
</html>
<div class="column" align="left">
{%- if minutes.size > 0 -%}
<h2 class="post-list-heading">Meeting minutes</h2>
{%- endif -%}
<ul class="post-list">
{%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%}
{%- for minutes in minutes -%}
<li>
<span class="post-meta">{{ minutes.date | date: date_format }}</span>
<h3>
<a class="post-link" href="{{ minutes.url | relative_url }}">
{{ minutes.title | escape }}
</a>
</h3>
{%- if site.show_excerpts -%}
{{ minutes.excerpt }}
{%- endif -%}
</li>
{%- endfor -%}
</ul>
</div>
</div>

{% if site.paginate %}
<div class="pager">
Expand All @@ -102,7 +80,5 @@ <h3>
</ul>
</div>
{%- endif %}

{%- endif -%}

</div>

0 comments on commit a75d5b2

Please sign in to comment.