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

This reverts commit 8b8da21593.
This commit is contained in:
2020-03-03 11:07:22 +00:00
parent 9e9f9f8c64
commit fa40e6fd0e
91 changed files with 4529 additions and 4099 deletions

View File

@@ -0,0 +1,65 @@
{% if site.categories.articles.size > 1 %}
{% assign article_list_displayed = false %}
{% for article in site.categories.articles %}
{% if article.url != page.url %}
{% assign authors = article.authors | split: ", " %}
{% for author in authors %}
{% assign article_date = article.date | date: "%Y" %}
{% assign current_article_date = page.date | date: "%Y" %}
{% if article_date == current_article_date %}
{% assign current_authors = page.authors | split: ", " %}
{% for current_author in current_authors %}
{% assign break = false %}
{% if author == current_author %}
{% if article_list_displayed == false %}
<h2 class="mdc-typography--headline5 article-carousel-title">
{% if current_authors.size > 1 %}
Other Articles By These Authors
{% else %}
Other Articles By This Author
{% endif %}
</h2>
<!-- define carousel -->
<div class="carousel">
{% assign article_list_displayed = true %}
{% endif %}
<!-- display article -->
<div class="carousel-item">
<div class="mdc-card">
<div class="mdc-card__media mdc-card__media--16-9 {{ article.url | relative_url | replace: '/', '-' | replace: '.', '-' }}"></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-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>
<style>
.{{ article.url | relative_url | replace: '/', '-' | replace: '.', '-' }} {
background-image: url("/images/{{ article.url | relative_url | remove: '.html' | replace: '/', '-' | remove: '-articles-' }}--cover.jpg");
}
</style>
</div>
</div>
{% assign break = true %}
{% break %}
{% endif %}
{% endfor %}
{% endif %}
{% if break == true %}
{% break %}
{% endif %}
{% endfor %}
{% endif %}
{% endfor %}
{% if article_list_displayed == true %}
<!-- close carousel -->
</div>
{% endif %}
{% endif %}

View File

@@ -1,3 +1,5 @@
<link href="/css/slick.css" rel="stylesheet">
<link href="/css/slick-theme.css" rel="stylesheet">
<script src="/js/slick.min.js"></script>
<link href="/css/article-page.css" rel="stylesheet">
<script src="/js/article-page.js"></script>
<script src="/js/top-scroll-button.js"></script>

View File

@@ -1,6 +1,4 @@
<div class="footer-container">
<footer>
<img>
<span >&copy; Matthew G {{ "now" | date: "%Y" }} | Made by <a href="https://mgrove.uk">Matthew G</a></span>
</footer>
</div>
<footer>
<img>
<span >&copy; Reading School {{ "now" | date: "%Y" }} | Made by <a href="https://mgrove.uk">Matthew G</a></span>
</footer>

View File

@@ -39,10 +39,8 @@
<link href="/css/material_icons.css" rel="stylesheet">
<script src="/js/material-components-web.min.js"></script>
<!-- import Jarallax for parallax backgrounds -->
<script src="/js/jarallax.min.js"></script>
<!-- import local styling & scripts -->
<script src="/js/global.js"></script>
<link href="/css/global.css" rel="stylesheet">
<script src="/js/top-scroll-button.js"></script>
</head>

View File

@@ -2,7 +2,7 @@
<div class="mdc-drawer__content">
<nav class="mdc-list">
<div style="margin: 15px;text-align:center;">
<img src="/images/logo-white.png" style="width: 90%;"/>
<img src="/images/page-logo.png" style="width: 90%;"/>
<img src="/images/young-reporter-logo.png" style="width: 90%;padding-top:15px;"/>
</div>
<a class="mdc-list-item" href="https://reading-school.co.uk" data-mdc-auto-init="MDCRipple">

View File

@@ -2,7 +2,7 @@
<div class="mdc-top-app-bar__row">
<section class="mdc-top-app-bar__section mdc-top-app-bar__section--align-start">
<a href="javascript:void(0);" class="material-icons mdc-top-app-bar__navigation-icon">menu</a>
<span class="mdc-top-app-bar__title" onclick="window.location='/';">BBC Young Reporter | Reading School</span>
<span class="mdc-top-app-bar__title">BBC Young Reporter | Reading School</span>
</section>
<section class="mdc-top-app-bar__section mdc-top-app-bar__section--align-end" role="toolbar">
<a href="/" class="mdc-top-app-bar__action-item" aria-label="Reading School" style="padding:0;">