This commit is contained in:
2019-02-13 18:21:47 +01:00
parent 5eedee288e
commit 5e38ba5916
124 changed files with 376 additions and 7476 deletions
@@ -17,32 +17,46 @@
{% do assets.add('theme://js/scopedQuerySelectorShim.min.js') %}
{% endblock %}
{% block hero %}
{% include 'partials/hero.html.twig' with {id: 'blog-hero', content: page.content, hero_image: blog_image} %}
{% endblock %}
{% block body %}
<section id="body-wrapper" class="section blog-listing">
<section class="container {{ grid_size }}">
{% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
{% include 'partials/breadcrumbs.html.twig' %}
{% endif %}
<section id="body-wrapper">
<section>
{% embed 'partials/layout.html.twig' with {blog: page} %}
{% block item %}
<div class="bricklayer">
{% for child in collection %}
{% include 'partials/blog-list-item.html.twig' with {blog: page, page: child} %}
{% endfor %}
<div class="works works-mea">
{% for child in collection %}
{% set mea = child.header.mea == 'true' %}
{% if mea %}
{% include 'partials/blog-list-item.html.twig' with {blog: page, page: child} %}
{% endif %}
{% endfor %}
</div>
{% if show_pagination and config.plugins.pagination.enabled and collection.params.pagination %}
<div id="listing-footer">
{% include 'partials/pagination.html.twig' with {base_url: page.url, pagination: collection.params.pagination} %}
<div class="scroll">
<p>scroll</p>
<p>scroll</p>
</div>
<div class="cat-list">
{% for child in collection if child.template == 'item' %}
<div class="cat">
{% include 'partials/blog/category.html.twig' with {blog: page, page: child} %}
</div>
{% endfor %}
</div>
<div class="works full-works">
{% for child in collection if child.template == 'item' %}
{% include 'partials/blog-list-item.html.twig' with {blog: page, page: child} %}
{% endfor %}
</div>
{% if show_pagination and config.plugins.pagination.enabled and collection.params.pagination %}
<div id="listing-footer">
{% include 'partials/pagination.html.twig' with {base_url: page.url, pagination: collection.params.pagination} %}
</div>
{% endif %}
{% endblock %}
@@ -58,6 +72,3 @@
var bricklayer = new Bricklayer(document.querySelector('.bricklayer'))
</script>
{% endblock %}
@@ -1,5 +1,4 @@
{% extends 'partials/base.html.twig' %}
{% block content %}
<h3>{{page.title}}</h3>
{{ page.content|raw }}
{% endblock %}
@@ -19,6 +19,7 @@
{% endif %}
{% endblock %}
{% block body %}
<section id="body-wrapper" class="section blog-listing">
<section class="container {{ grid_size }}">
@@ -1,22 +1,8 @@
{% macro nav_loop(page) %}
{% import _self as macros %}
{% for p in page.children.visible %}
{% for p in page.children.visible if p.template == 'default' %}
{% set active_page = (p.active or p.activeChild) ? ' class="active"' : '' %}
{% if p.children.visible.count > 0 %}
<li>
<a href="{{ p.url }}"{{ active_page }}>
{{ p.menu }}
</a>
<ul>
{{ macros.nav_loop(p) }}
</ul>
</li>
{% else %}
<li>
<a href="{{ p.url }}"{{ active_page }}>
{{ p.menu }}
</a>
</li>
{% endif %}
{% include 'default.html.twig' with {blog: page, page: p} %}
{% endfor %}
{% endmacro %}
@@ -34,49 +34,36 @@
{% endblock head %}
</head>
<body id="top" class="{% block body_classes %}{{ body_classes }}{% endblock %}">
<body id="top">
<div id="page-wrapper">
{% block header %}
<section id="header" class="section">
<header>
<section class="container {{ grid_size }}">
<nav class="navbar">
<section class="navbar-section logo">
{% include 'partials/logo.html.twig' %}
<a href="/"><h1>{{site.title|lower}}</h1></a>
<h2>{{site.header.status|capitalize}}</h2>
</section>
<section class="navbar-section desktop-menu">
<nav class="dropmenu animated">
{% block header_navigation %}
{% include 'partials/navigation.html.twig' %}
{% endblock %}
</nav>
{% if config.plugins.login.enabled and grav.user.username %}
<span class="login-status-wrapper"><i class="fa fa-user"></i> {% include 'partials/login-status.html.twig' %}</span>
{% endif %}
</section>
</nav>
<div class="contact">
{% include 'partials/navigation.html.twig' %}
</div>
</section>
</section>
<div class="mobile-menu">
<div class="button_container" id="toggle">
<span class="top"></span>
<span class="middle"></span>
<span class="bottom"></span>
</div>
</div>
</header>
{% endblock %}
{% block hero %}{% endblock %}
<section id="start">
{% block body %}
<section id="body-wrapper" class="section">
<section class="container {{ grid_size }}">
{% block messages %}
{% include 'partials/messages.html.twig' ignore missing %}
{% endblock %}
<section id="body-wrapper">
<section>
{% block content %}{% endblock %}
</section>
</section>
@@ -85,20 +72,6 @@
</div>
{% block footer %}
{% include 'partials/footer.html.twig' %}
{% endblock %}
<div class="mobile-container">
<div class="overlay" id="overlay">
<div class="mobile-logo">
{% include 'partials/logo.html.twig' with {mobile: true} %}
</div>
<nav class="overlay-menu">
{% include 'partials/navigation.html.twig' with {tree: true} %}
</nav>
</div>
</div>
{% block bottom %}
{{ assets.js('bottom')|raw }}
@@ -1,37 +1,76 @@
<div class="content-item h-entry">
{% if not hero_image_name %}
<div class="content-title text-center">
{% include 'partials/blog/title.html.twig' with {title_level: 'h2'} %}
{% if page.header.subtitle %}
<h3 >{{ page.header.subtitle }}</h3>
{% endif %}
{% include 'partials/blog/date.html.twig' %}
{% include 'partials/blog/category.html.twig' %}
{% include 'partials/blog/taxonomy.html.twig' %}
</div>
{% endif %}
{% if not hero_image_name %}
<div class="content-title text-center">
{% include 'partials/blog/title.html.twig' with {title_level: 'h2'} %}
{% if page.header.subtitle %}
<h3 >{{ page.header.subtitle }}</h3>
{% endif %}
{% include 'partials/blog/date.html.twig' %}
{% include 'partials/blog/taxonomy.html.twig' %}
</div>
{% endif %}
<p class="prev-next text-center">
{% if not page.isLast %}
<a class="btn" href="{{ page.prevSibling.url }}">
<div class="e-content">
{{ page.content|raw }}
</div>
<span class="title">{{ page.prevSibling.title }}</span>
{% if page.header.continue_link is same as(true) and config.plugins.comments.enabled %}
{% include 'partials/comments.html.twig' %}
{% endif %}
{% if page.prevSibling.taxonomy.category %}
<span class="tags">
{% for category in page.prevSibling.taxonomy.category %}
{{ category }}
{% endfor %}
</span>
{% endif %}
<span class="blog-date">
<time class="dt-published" datetime="{{ page.date|date("c") }}">
{{ page.prevSibling.date|date("Y") }}
</time>
</span>
</a>
{% endif %}
{% if not page.isFirst %}
<a class="btn" href="{{ page.nextSibling.url }}">
<span class="title">{{ page.nextSibling.title }}</span>
{% if page.nextSibling.taxonomy.category %}
<span class="tags">
{% for category in page.nextSibling.taxonomy.category %}
{{ category }}
{% endfor %}
</span>
{% endif %}
<span class="blog-date">
<time class="dt-published" datetime="{{ page.date|date("c") }}">
{{ page.nextSibling.date|date("Y") }}
</time>
</span>
</a>
{% endif %}
</p>
<div class="e-content">
{{ page.content|raw }}
{% set image = page.media.images|first %}
{% if image %}
{{ image.cropZoom(800,400).html }}
{% endif %}
</div>
<div class="top">
<a href="#page-wrapper">
<img src="" alt="">
<p>top</p>
</a>
</div>
</div>
<p class="prev-next text-center">
{% if not page.isLast %}
<a class="btn" href="{{ page.prevSibling.url }}"><i class="fa fa-angle-left"></i> {{ 'THEME_QUARK.BLOG.ITEM.PREV_POST'|t }}</a>
{% endif %}
{% if not page.isFirst %}
<a class="btn" href="{{ page.nextSibling.url }}">{{ 'THEME_QUARK.BLOG.ITEM.NEXT_POST'|t }} <i class="fa fa-angle-right"></i></a>
{% endif %}
</p>
@@ -5,23 +5,28 @@
<a href="{{ page.url }}">{{ image.cropZoom(800,400).html }}</a>
</div>
{% endif %}
<div class="card-header">
<div class="card-subtitle text-gray">
{% include 'partials/blog/date.html.twig' %}
</div>
<div class="card-title">
{% include 'partials/blog/title.html.twig' with {title_level: 'h5'} %}
</div>
</div>
<div class="card-body">
{% if page.summary != page.content %}
{{ page.summary|raw }}
{% else %}
{{ page.content|raw }}
{% endif %}
</div>
<div class="card-footer">
{% include 'partials/blog/taxonomy.html.twig' %}
</div>
</div>
{% if page.date %}
<div class="card-date">
{% include 'partials/blog/date.html.twig' %}
</div>
{% endif %}
{% if page.taxonomy.category %}
<div class="card-category">
{% include 'partials/blog/category.html.twig' %}
</div>
{% endif %}
</div>
{% if page.taxonomy.tag %}
<div class="card-footer">
{% include 'partials/blog/taxonomy.html.twig' %}
</div>
{% endif %}
</div>
@@ -0,0 +1,7 @@
{% if page.taxonomy.category %}
<span>
{% for category in page.taxonomy.category %}
<a href="{{ blog.url|rtrim('/') }}/category{{ config.system.param_sep }}{{ category }}">{{ category }}</a>
{% endfor %}
</span>
{% endif %}
@@ -1,5 +1,5 @@
<span class="blog-date">
<time class="dt-published" datetime="{{ page.date|date("c") }}">
<i class="fa fa-calendar"></i> {{ page.date|date(system.pages.dateformat.short) }}
<span>
<time datetime="{{ page.date|date("c") }}">
{{ page.date|date("Y") }}
</time>
</span>
@@ -1,7 +1,7 @@
{% if page.taxonomy.tag %}
<span class="tags">
{% for tag in page.taxonomy.tag %}
<a class="label label-rounded {{ label_style ?: 'label-secondary' }} p-category" href="{{ blog.url|rtrim('/') }}/tag{{ config.system.param_sep }}{{ tag }}#body-wrapper">{{ tag }}</a>
<a class="label label-rounded {{ label_style ?: 'label-secondary' }} p-tag" href="{{ blog.url|rtrim('/') }}/tag{{ config.system.param_sep }}{{ tag }}#body-wrapper">{{ tag }}</a>
{% endfor %}
</span>
{% endif %}
@@ -1,11 +1,11 @@
{% set title_level = title_level ?: 'h2' %}
{% if page.header.link %}
<{{ title_level }} class="p-name mt-1">
<{{ title_level }}>
{% if page.header.continue_link is not same as(false) %}
<a href="{{ page.url }}"><i class="fa fa-angle-double-right u-url"></i></a>
{% endif %}
<a href="{{ page.header.link }}" class="u-url">{{ page.title }}</a>
</{{ title_level }}>
{% else %}
<{{ title_level }} class="p-name mt-1"><a href="{{ page.url }}" class="u-url">{{ page.title }}</a></{{ title_level }}>
<{{ title_level }}><a href="{{ page.url }}">{{ page.title }}</a></{{ title_level }}>
{% endif %}
@@ -1,14 +1,6 @@
{% set item_col = show_sidebar ? 'col-9 col-md-12' : 'col-12' %}
{% set sidebar_col = show_sidebar ? 'col-3 col-md-12' : 'col-12' %}
<div class="columns">
<div id="item" class="column {{ item_col }} extra-spacing">
<div id="items">
{% block item %}{% endblock %}
</div>
{% if show_sidebar %}
<div id="sidebar" class="column {{ sidebar_col }}">
{% block sidebar %}{% endblock %}
</div>
{% endif %}
</div>
@@ -1,6 +1,3 @@
{% import 'macros/macros.html.twig' as macros %}
<ul {{ tree ? 'class="tree"' : '' }}>
{{ macros.nav_loop(pages) }}
</ul>