Merge remote-tracking branch 'github/master'

# Conflicts:
#	assets/css/screen.css
#	custom-tags.hbs
#	tag.hbs
This commit is contained in:
Bea 2020-10-30 21:37:54 +01:00
commit dec41159a8
4 changed files with 1113 additions and 1049 deletions

File diff suppressed because it is too large Load Diff

View File

@ -9,14 +9,16 @@
</div>
<main>
<nav class="navbar-secondary unselectable">
<nav class="mind-global-navbar_secondary unselectable">
{{navigation type="secondary"}}
</nav>
<div class="mind-content_main">
<div class="mind-feed-content_main">
{{#foreach tags}}
{{> "tag-card-big"}}
{{/foreach}}
<div class="mind-tag-content_main">
{{#get 'tags' limit='all' include='count.posts' order='count.posts desc'}}
{{#foreach tags}}
{{> "tag-card-big"}}
{{/foreach}}
{{/get}}
</div>
</div>
</main>

View File

@ -1,17 +1,8 @@
<article class="{{post_class}}">
<a class="mind-post-card-big_main" href="{{url}}">
<img class="mind-post-card-big_feature-image" src="{{img_url feature_image size="m"}}" />
<header class="mind-post-card-big_header">
<p class="mind-post-card-big_meta"><span class="mind-post-card-big_tag">{{primary_tag.name}}</span>
• <time class="post-date" datetime="{{date format='YYYY-MM-DD'}}">{{date format="DD MMMM YYYY"}}</time></p>
<h3>{{title}}</h3>
<a class="mind-tag-card_main" href="{{url}}">
<img class="mind-tag-card_feature-image" src="{{img_url feature_image size="s"}}" />
<header class="mind-tag-card_header">
<h4>{{name}}</h4>
</header>
<section class="mind-post-card-big_excerpt">
<p>{{excerpt words="26"}}</p>
</section>
<footer class="mind-post-card-big_footer">
{{primary_author.name}}
{{#if primary_author.profile_image}}<img class="mind-post-card-big_author-image" src="{{img_url primary_author.profile_image size="xxs"}}" alt="Author image" />{{/if}}
</footer>
</a>
</article>

105
tag.hbs
View File

@ -1,52 +1,53 @@
{{!< default}}
<div class="mind-post-header unselectable">
{{#tag}}
<div>
<h1>{{name}}</h1>
<p>
{{#if description}}
{{description}}
{{else}}
{{plural ../pagination.total empty='posts' singular='% post' plural='% posts'}}
{{/if}}
</p>
</div>
{{/tag}}
<i class="mind-global-header_arrow-down mind-global-header_arrow-down-mid"></i>
</div>
<main>
<div class="mind-content_main">
<div class="mind-feed-content_main">
<!-- Looping through every post -->
{{#foreach posts}}
{{> "post-card-big"}}
{{/foreach}}
</div>
</div>
</main>
<!-- Vanta.JS Scripts to make the background cool, but disabled on mobile -->
<script>
if(window.screen.width > 800)
{
document.write('<script src="{{asset "js/three.r95.min.js"}}"><\/script>' +
'<script src="{{asset "js/vanta.net.min.js"}}"><\/script>' +
'<script>' +
'VANTA.NET({'+
'el: "#vantajs",'+
'color: 0x3fd5ff,'+
'backgroundColor: 0x190f2b,'+
'mouseControls: true,'+
'touchControls: true,'+
'minHeight: 200.00,'+
'minWidth: 200.00,'+
'scale: 1.00,'+
'scaleMobile: 1.00'+
'})'+
'<\/script>');
}
</script>
{{!< default}}
<div class="mind-post-header unselectable">
{{#tag}}
<div>
<h1>{{name}}</h1>
<p>
{{#if description}}
{{description}}
{{else}}
{{plural ../pagination.total empty='posts' singular='% post' plural='% posts'}}
• <a class="mind-post-header_tag" href="/tags/">see all tags</a>
{{/if}}
</p>
</div>
{{/tag}}
<i class="mind-global-header_arrow-down mind-global-header_arrow-down-mid"></i>
</div>
<main>
<div class="mind-content_main">
<div class="mind-feed-content_main">
<!-- Looping through every post -->
{{#foreach posts}}
{{> "post-card-big"}}
{{/foreach}}
</div>
</div>
</main>
<!-- Vanta.JS Scripts to make the background cool, but disabled on mobile -->
<script>
if(window.screen.width > 800)
{
document.write('<script src="{{asset "js/three.r95.min.js"}}"><\/script>' +
'<script src="{{asset "js/vanta.net.min.js"}}"><\/script>' +
'<script>' +
'VANTA.NET({'+
'el: "#vantajs",'+
'color: 0x3fd5ff,'+
'backgroundColor: 0x190f2b,'+
'mouseControls: true,'+
'touchControls: true,'+
'minHeight: 200.00,'+
'minWidth: 200.00,'+
'scale: 1.00,'+
'scaleMobile: 1.00'+
'})'+
'<\/script>');
}
</script>