Revert "Revert "Merge pull request #2 from mgrove36/development""

This reverts commit fa40e6fd0e.
This commit is contained in:
2020-03-03 11:07:22 +00:00
parent fa40e6fd0e
commit e9efb7ab91
91 changed files with 4087 additions and 4517 deletions

View File

@@ -18,7 +18,6 @@
</div>
</main>
{% include footer.html %}
{% include top-scroll-button.html %}
</div>
</body>
<style>

View File

@@ -1,7 +1,8 @@
<!DOCTYPE html>
<html>
{% include head.html %}
<link href="/css/mdc-card-list.css" rel="stylesheet">
<link href="/css/article-list.css" rel="stylesheet">
<link href="/css/home.css" rel="stylesheet">
<body>
<!-- cookie notice is included automatically -->
{% include cookie-notice.html %}
@@ -18,7 +19,6 @@
</div>
</main>
{% include footer.html %}
{% include top-scroll-button.html %}
</div>
</body>
</html>

View File

@@ -14,18 +14,19 @@
<main class="main-content" id="main-content">
<div class="mdc-top-app-bar--short-fixed-adjust">
<h2 class="mdc-typography--headline3">{{ page.title }}</h2>
<div class="parallax-section article-title-section" data-jarallax data-speed="0.4" style="background-image: url('/images/{{ page.url | relative_url | remove: '.html' | replace: '/', '-' | remove: '-articles-' }}.jpg');">
<h2 class="mdc-typography--headline3">{{ page.title }}</h2>
</div>
<figcaption class="mdc-typography--caption-text">{{ page.image-caption }}</figcaption>
<h3 class="mdc-typography--subtitle1">
<time class="timeago" datetime="{{ page.date | date: '%Y-%m-%d' }}T{{ page.date | date: '%H:%M:%S' }}">{{ page.date | date: '%A %e %B %Y' }}</time>
| by {{ page.authors }}
</h3>
<figure>
<img src="/images/{{ page.url | relative_url | remove: '.html' | replace: '/', '-' | remove: '-articles-' }}--cover.jpg" style="width:100%;">
<figcaption class="mdc-typography--caption-text">{{ page.image-caption }}</figcaption>
</figure>
{{ content }}
{% include article-carousel.html %}
<div class="article-content">
{{ content }}
</div>
<div class="splitter"></div>
</div>
</main>
{% include footer.html %}

View File

@@ -24,8 +24,6 @@
<figcaption class="mdc-typography--caption-text">{{ page.video-caption }}</figcaption>
</figure>
{{ content }}
{% include article-carousel.html %}
</div>
</main>
{% include footer.html %}

55
_layouts/year.html Normal file
View File

@@ -0,0 +1,55 @@
<!DOCTYPE html>
<html>
{% include head.html %}
<link href="/css/article-list.css" rel="stylesheet">
<link href="/css/year.css" rel="stylesheet">
<body>
<!-- cookie notice is included automatically -->
{% include cookie-notice.html %}
<!-- content of navbar is included via jQuery -->
{% include navbar.html %}
<div class="mdc-drawer-app-content">
{% include top-app-bar.html %}
<main class="main-content" id="main-content">
<div class="mdc-top-app-bar--short-fixed-adjust">
{% assign pageyear = page.url | relative_url | remove: '.html' | remove: '/' %}
<div class="year-header parallax-section" data-jarallax data-speed="0.4" style="background-image: url('/images/backgrounds/{{ pageyear }}.jpg');">
<h1 class="mdc-typography--headline1">{{ pageyear }}</h1>
</div>
<div class="splitter"></div>
<div class="article-section">
<div class="articles">
{% assign articles = site.categories.articles | sort: date | reverse %}
{% for article in articles %}
{% assign articleyear = article.date | date: "%Y" %}
{% if pageyear == articleyear %}
<div class="mdc-card" onclick="window.location='{{ article.url | relative_url }}';">
<div class="mdc-card__media mdc-card__media--16-9" style="background-image: url('/images/{{ article.url | relative_url | remove: '.html' | replace: '/', '-' | remove: '-articles-' }}.jpg');"></div>
<div class="mdc-card-content">
<h2 class="mdc-typography--headline6">{{ article.title }}</h2>
<h3 class="mdc-typography--subtitle2">
<time class="timeago" datetime="{{ article.date | date: '%Y-%m-%d' }}T{{ article.date | date: '%H:%M:%S' }}">{{ article.date | date: '%A %e %B %Y' }}</time>
| by {{ article.authors }}
</h3>
</div>
<div class="mdc-typography--body2">{{ article.description }}</div>
<div class="mdc-card__actions">
<div class="mdc-card__action-buttons">
<button class="mdc-button mdc-card__action mdc-card__action--button" data-mdc-auto-init="MDCRipple" onclick="window.location='{{ article.url | relative_url }}';">Read</button>
</div>
</div>
</div>
{% endif %}
{% endfor %}
</div>
</div>
<div class="splitter"></div>
</div>
</main>
{% include footer.html %}
</div>
</body>
</html>