makary/grav-theme-future2021
1
0
Fork 0
mirror of https://github.com/pmoreno-rodriguez/grav-theme-future2021.git synced 2025-07-03 00:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10 from pmoreno-rodriguez/develop

Browse source 
Revert "Harmonize and modify twigs"
This commit is contained in:
pmoreno.rodriguez 2022-12-27 13:35:17 +01:00 • committed by GitHub
commit 92ee80bbf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 212 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
assets/css/main.css
View file

@ -2635,8 +2635,8 @@ table.alt tfoot {
text-transform: uppercase; text-transform: uppercase;
display: block; display: block;
border-bottom: none; border-bottom: none;
padding: 0.5rem 0.8rem; padding: 0.3rem 0.8rem;
line-height: 1.5em; line-height: 2.5em;
} }
#header .dropdown li ul li a:hover { #header .dropdown li ul li a:hover {
color: #181818; color: #181818;
@ -3004,6 +3004,19 @@ body.single #wrapper {
position: relative; position: relative;
width: 4em; width: 4em;
} }
#intro .logo:before {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100px' height='100px' viewBox='0 0 100 100' preserveAspectRatio='none' zoomAndPan='disable'%3E%3Cpolygon points='0,0 100,0 100,25 50,0 0,25' style='fill:%23f4f4f4' /%3E%3Cpolygon points='0,100 100,100 100,75 50,100 0,75' style='fill:%23f4f4f4' /%3E%3C/svg%3E");
background-position: top left;
background-repeat: no-repeat;
background-size: 100% 100%;
content: "";
display: block;
height: 100%;
left: 0;
position: absolute;
top: 0;
width: 100%;
}
#intro .logo img { #intro .logo img {
display: block; display: block;
margin-left: -0.25em; margin-left: -0.25em;

2
assets/css/main.min.css vendored
View file

File diff suppressed because one or more lines are too long

32
assets/sass/components/_dropdownmenu.scss
View file

@ -1,19 +1,19 @@
/* Dropdown menu in header */ /* Dropdown menu in header */
#header { #header {
.dropdown { .dropdown {
@include vendor('flex', '1'); @include vendor('flex', '1');
border-left: solid 1px _palette(border); border-left: solid 1px _palette(border);
height: inherit; height: inherit;
line-height: inherit; line-height: inherit;
margin-left: _size(section-spacing-small); margin-left: _size(section-spacing-small);
li { li {
position: relative; position: relative;
float: left; float: left;
text-transform: uppercase; text-transform: uppercase;
font-size: 12pt; font-size: 12pt;
height: inherit; height: inherit;
a { a {
font-family: _font(family-heading); font-family: _font(family-heading);
font-size: 0.8em; font-size: 0.8em;
@ -22,8 +22,8 @@
@include vendor('display', 'block'); @include vendor('display', 'block');
border-bottom: none; border-bottom: none;
padding: 0 0.8rem; padding: 0 0.8rem;
height: inherit; height: inherit;
} }
ul { ul {
position: absolute; position: absolute;
@ -35,9 +35,9 @@
line-height: normal; line-height: normal;
background-color: _palette(bg-dropdown); background-color: _palette(bg-dropdown);
box-shadow: 0 0.05rem 1rem _palette(border-dropdown) !important; box-shadow: 0 0.05rem 1rem _palette(border-dropdown) !important;
li { li {
a { a {
font-family: _font(family-heading); font-family: _font(family-heading);
font-size: 0.8em; font-size: 0.8em;
@ -46,25 +46,25 @@
text-transform: uppercase; text-transform: uppercase;
@include vendor('display', 'block'); @include vendor('display', 'block');
border-bottom: none; border-bottom: none;
padding: 0.5rem 0.8rem; padding: 0.3rem 0.8rem;
line-height: 1.5em; line-height: 2.5em;
&:hover { &:hover {
color: #181818; color: #181818;
} }
} }
ul { ul {
left: 100%; left: 100%;
top: 0; top: 0;
} }
} }
} }
} }
ul { ul {
li { li {
margin-left: 0.5em; margin-left: 0.5em;
padding-left: 0.5em; padding-left: 0.5em;
@ -84,14 +84,14 @@
background-color: _palette(bg); background-color: _palette(bg);
box-shadow: 0 0.05rem 1rem _palette(border-dropdown) !important; box-shadow: 0 0.05rem 1rem _palette(border-dropdown) !important;
} }
} }
} }
} }
@include breakpoint('<=medium') { @include breakpoint('<=medium') {
.dropdown { .dropdown {
display: none; display: none;
} }
} }
@include breakpoint('<=small') { @include breakpoint('<=small') {
.dropdown { .dropdown {

14
assets/sass/layout/_intro.scss
View file

@ -15,6 +15,20 @@
position: relative; position: relative;
width: 4em; width: 4em;
&:before {
background-image: svg-url('<svg xmlns="http://www.w3.org/2000/svg" width="100px" height="100px" viewBox="0 0 100 100" preserveAspectRatio="none" zoomAndPan="disable"><polygon points="0,0 100,0 100,25 50,0 0,25" style="fill:#{_palette(bg-alt)}" /><polygon points="0,100 100,100 100,75 50,100 0,75" style="fill:#{_palette(bg-alt)}" /></svg>');
background-position: top left;
background-repeat: no-repeat;
background-size: 100% 100%;
content: '';
display: block;
height: 100%;
left: 0;
position: absolute;
top: 0;
width: 100%;
}
img { img {
display: block; display: block;
margin-left: -0.25em; margin-left: -0.25em;

78
templates/blog.html.twig
View file

@ -1,51 +1,49 @@
{% extends 'partials/base.html.twig' %} {% embed 'partials/base.html.twig' %}
{% set collection = page.collection() %} {% set collection = page.collection() %}
{% set base_url = page.url %} {% set base_url = page.url %}
{% set feed_url = base_url %} {% set feed_url = base_url %}
{% if page.header.show_breadcrumbs is defined %} {% if page.header.show_breadcrumbs is defined %}
{% set show_breadcrumbs = page.header.show_breadcrumbs %} {% set show_breadcrumbs = page.header.show_breadcrumbs %}
{% else %} {% else %}
{% set show_breadcrumbs = true %} {% set show_breadcrumbs = true %}
{% endif %} {% endif %}
{% if page.header.show_pagination is defined %} {% if page.header.show_pagination is defined %}
{% set show_pagination = page.header.show_pagination %} {% set show_pagination = page.header.show_pagination %}
{% else %} {% else %}
{% set show_pagination = true %} {% set show_pagination = true %}
{% endif %} {% endif %}
{% if base_url == '/' %} {% if base_url == '/' %}
{% set base_url = '' %} {% set base_url = '' %}
{% endif %} {% endif %}
{% if base_url == base_url_relative %} {% if base_url == base_url_relative %}
{% set feed_url = base_url~'/'~page.slug %} {% set feed_url = base_url~'/'~page.slug %}
{% endif %} {% endif %}
{% block menu %} {% block menu %}
{% include 'partials/sidebar_right.html.twig' %} {% include 'partials/sidebar_right.html.twig' %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %} {% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
{% include 'partials/breadcrumbs.html.twig' %} {% include 'partials/breadcrumbs.html.twig' %}
{% endif %}
{#
{% if show_pagination and config.plugins.pagination.enabled and collection.params.pagination %}
{% include 'partials/pagination.html.twig' with {base_url: page.url, pagination: collection.params.pagination} %}
{% endif %}
#}
{% for child in collection %}
{% if child.header.hide is not defined or not child.header.hide %}
{% include 'partials/blog_item.html.twig' with {'page':child, 'truncate':true} %}
{% endif %} {% endif %}
{% endfor %}
{% if show_pagination and config.plugins.pagination.enabled and collection.params.pagination %} {% for child in collection %}
{% include 'partials/pagination.html.twig' with {base_url: page.url, pagination: collection.params.pagination} %} {% include 'partials/blog_item.html.twig' with {'page':child, 'truncate':true} %}
{% endif %} {% endfor %}
{% if show_pagination and config.plugins.pagination.enabled and collection.params.pagination %}
{% include 'partials/pagination.html.twig' with {base_url: page.url, pagination: collection.params.pagination} %}
{% endif %}
{% endblock %}
{% block sidebar %}
{% include 'partials/sidebar_left.html.twig' %}
{% endblock %}
{% endembed %}
<section id="footer" class="align-center">
{% include 'partials/footer.html.twig' %}
</section>
{% endblock %}

51
templates/default.html.twig
View file

@ -1,33 +1,34 @@
{% extends 'partials/base.html.twig' %} {% extends 'partials/base.html.twig' %}
{% if page.header.show_breadcrumbs is defined %}
{% set show_breadcrumbs = page.header.show_breadcrumbs %}
{% else %}
{% set show_breadcrumbs = true %}
{% endif %}
{% block menu %} {% block menu %}
{% include 'partials/sidebar_right.html.twig' %} {% include 'partials/sidebar_right.html.twig' %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %} <article class="post">
{% include 'partials/breadcrumbs.html.twig' %} <header>
{% endif %} <div class="title">
<h2>{{ page.header.title }}</h2>
{% if page.header.subtitle %}
<p>{{ page.header.subtitle }}</p>
{% endif %}
</div>
<article class="post"> </header>
<header> {% if page.header.primaryImage %}
<div class="title"> {{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}
<h2>{{ page.header.title }}</h2> {% else %}
{% if page.header.subtitle %} {{ page.media.images|first.cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}
<p>{{ page.header.subtitle }}</p> {% endif %}
{% endif %} {{ page.content|raw}}
</div>
</header> </article>
{{ page.content|raw }} <section id="footer" class="align-center">
</article> {% block footer %}
{% include 'partials/footer.html.twig' %}
<section id="footer" class="align-center"> {% endblock %}
{% include 'partials/footer.html.twig' %} </section>
</section>
{% endblock %} {% endblock %}

46
templates/item.html.twig
View file

@ -1,23 +1,31 @@
{% extends 'partials/base.html.twig' %} {% embed 'partials/base.html.twig' %}
{% set base_url = page.parent.url %}
{% set feed_url = base_url %}
{% set show_breadcrumbs = header_var('show_breadcrumbs', [page, blog]) %}
{% if page.header.show_breadcrumbs is defined %} {% if base_url == '/' %}
{% set show_breadcrumbs = page.header.show_breadcrumbs %} {% set base_url = '' %}
{% else %}
{% set show_breadcrumbs = true %}
{% endif %}
{% block menu %}
{% include 'partials/sidebar_right.html.twig' %}
{% endblock %}
{% block content %}
{% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
{% include 'partials/breadcrumbs.html.twig' %}
{% endif %} {% endif %}
{% include 'partials/blog_item.html.twig' with {'truncate':false} %} {% if base_url == base_url_relative %}
{% set feed_url = base_url~'/'~page.parent.slug %}
{% endif %}
{% block menu %}
{% include 'partials/sidebar_right.html.twig' %}
{% endblock %}
<section id="footer" class="align-center"> {% block content %}
{% include 'partials/footer.html.twig' %}
</section> {% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
{% endblock %} {% include 'partials/breadcrumbs.html.twig' %}
{% endif %}
{% include 'partials/blog_item.html.twig' with {'truncate':false} %}
<section id="footer" class="align-center">
{% include 'partials/footer.html.twig' %}
</section>
{% endblock %}
{% endembed %}

144
templates/partials/blog_item.html.twig
View file

@ -1,87 +1,93 @@
<article class="post" itemprop="liveBlogUpdate" itemscope itemtype="http://schema.org/BlogPosting"> <article class="post" itemprop="liveBlogUpdate" itemscope itemtype="http://schema.org/BlogPosting">
{% if page.header.author %} {% if page.header.author %}
{% set author = page.header.author %} {% set author = page.header.author %}
{% else %} {% else %}
{% set author = page.header.taxonomy.author[0] %} {% set author = page.header.taxonomy.author[0] %}
{% endif %} {% endif %}
{% if author %} {% if author %}
{% set avatar = author|replace(' ', '-')|lower %} {% set avatar = author|replace(' ', '-')|lower %}
{% endif %} {% endif %}
<header> <header>
<div class="title"> <div class="title">
{% if page.header.link %} {% if page.header.link %}
<h2 itemprop="headline"> <h2 itemprop="headline">
{% if page.header.continue_link is not sameas(false) %} {% if page.header.continue_link is not sameas(false) %}
<a href="{{ page.url }}"></a> <a href="{{ page.url }}"></a>
{% endif %}
<a href="{{ page.header.link }}">{{ page.title }}</a>
</h2>
{% else %}
<h2 itemprop="headline"><a href="{{ page.url }}">{{ page.title }}</a></h2>
{% endif %}
{% if page.header.subtitle %}
<p itemprop="alternativeHeadline">{{ page.header.subtitle|raw }}</p>
{% endif %} {% endif %}
<a href="{{ page.header.link }}">{{ page.title }}</a>
</h2>
{% else %}
<h2 itemprop="headline"><a href="{{ page.url }}">{{ page.title }}</a></h2>
{% endif %}
{% if page.header.subtitle %}
<p itemprop="alternativeHeadline">{{ page.header.subtitle|raw }}</p>
{% endif %}
</div> </div>
<div class="meta"> <div class="meta">
<time class="published" itemprop="datePublished" datetime="{{page.date|dateTranslate(grav.config.system.pages.dateformat.short)}}">{{ page.date|dateTranslate(grav.config.system.pages.dateformat.short)}}</time> <time class="published" itemprop="datePublished" datetime="{{page.date|date("Y-m-d")}}">{{ page.date|date("M j, Y")}}</time>
{% if author %} {% if author %}
<a href="{{ base_url }}/author{{ config.system.param_sep }}{{ author }}" itemprop="keywords" class="author">{{ tag }}<span class="name" rel="author">{{ author }}</span>{% if page.header.avatarImage %}<img src="{{ page.media[page.header.avatarImage].url|e}}" alt="{{ author }}" />{% endif %}</a> <a href="{{ base_url }}/author{{ config.system.param_sep }}{{ author }}" itemprop="keywords" class="author">{{ tag }}<span class="name" rel="author">{{ author }}</span>{% if page.header.avatarImage %}<img src="{{ page.media[page.header.avatarImage].url|e}}" alt="{{ author }}" />{% endif %}</a>
{% endif %} {% endif %}
</div> </div>
</header> </header>
{% if page.header.primaryImage %} {% if page.header.primaryImage %}
<a href="{{ page.url }}" class="image featured">{{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title)|raw }}</a> <a href="{{ page.url }}" class="image featured">{{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}</a>
{% elseif page.media.images %} {% else %}
<a href="{{ page.url }}" class="image featured">{{ page.media.images|first.cropZoom(1038,437).loading('lazy').html(page.title, page.title)|raw }}</a> <a href="{{ page.url }}" class="image featured">{{ page.media.images|first.cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}</a>
{% endif %} {% endif %}
{% if page.header.blog_hide_body is not defined or not page.header.blog_hide_body %}
<div itemprop="articleBody"> <div itemprop="articleBody">
{% if page.header.continue_link is sameas(false) %}
{{ page.content|raw }} {% if page.header.continue_link is sameas(false) %}
{% if not truncate %} {{ page.content|raw }}
{% set show_prev_next = true %} {% if not truncate %}
{% endif %} {% set show_prev_next = true %}
{% elseif truncate and page.summary != page.content %} {% endif %}
{{ page.summary|raw }} {% elseif truncate and page.summary != page.content %}
{% elseif truncate %} {{ page.summary|raw }}
{{ page.content|truncate(550)|raw }} {% elseif truncate %}
{% else %} {{ page.content|truncate(550)|raw }}
{{ page.content|raw }} {% else %}
{% set show_prev_next = true %} {{ page.content|raw }}
{% endif %} {% set show_prev_next = true %}
</div> {% endif %}
{% endif %}
<footer> </div>
<footer>
<ul class="actions"> <ul class="actions">
{% if truncate and page.summary != page.content %} {% if truncate and page.summary != page.content %}
<li><a href="{{ page.url }}" class="button">{{'FUTURE.BLOG.ITEM.CONTINUE_READING'|t}}</a></li> <li><a href="{{ page.url }}" class="button">{{'FUTURE.BLOG.ITEM.CONTINUE_READING'|t}}</a></li>
{% elseif truncate %} {% elseif truncate %}
<li><a href="{{ page.url }}" class="button">{{'FUTURE.BLOG.ITEM.CONTINUE_READING'|t}}</a></li> <li><a href="{{ page.url }}" class="button">{{'FUTURE.BLOG.ITEM.CONTINUE_READING'|t}}</a></li>
{% endif %} {% endif %}
{% if show_prev_next %} {% if show_prev_next %}
{% if not page.isLast %} {% if not page.isLast %}
<li><a class="button" href="{{ page.prevSibling.url }}"><i class="fa fa-chevron-left"></i> {{'FUTURE.BLOG.ITEM.PREV_POST'|t}}</a></li> <li><a class="button" href="{{ page.prevSibling.url }}"><i class="fa fa-chevron-left"></i> {{'FUTURE.BLOG.ITEM.PREV_POST'|t}}</a></li>
{% endif %} {% endif %}
{% if not page.isFirst %} {% if not page.isFirst %}
<li><a class="button" href="{{ page.nextSibling.url }}">{{'FUTURE.BLOG.ITEM.NEXT_POST'|t}} <i class="fa fa-chevron-right"></i></a></li> <li><a class="button" href="{{ page.nextSibling.url }}">{{'FUTURE.BLOG.ITEM.NEXT_POST'|t}} <i class="fa fa-chevron-right"></i></a></li>
{% endif %} {% endif %}
{% endif %} {% endif %}
</ul>
<ul class="stats">
{% if page.taxonomy.tag %}
{% for tag in page.taxonomy.tag %}
<li><a href="{{ base_url }}/tag{{ config.system.param_sep }}{{ tag }}" itemprop="keywords">{{ tag }}</a></li>
{% endfor %}
{% endif %}
<li><a href="https://twitter.com/share" data-url="{{ page.url(true) }}" data-text="{{ page.title }}" class="icon brands fa-twitter"></a></li>
<li><a href="http://www.facebook.com/sharer.php?u={{ page.url(true) }}" class="icon brands fa-facebook"></a></li>
</ul> </ul>
</footer> <ul class="stats">
{% if page.taxonomy.tag %}
{% for tag in page.taxonomy.tag %}
<li><a href="{{ base_url }}/tag{{ config.system.param_sep }}{{ tag }}" itemprop="keywords">{{ tag }}</a></li>
{% endfor %}
{% endif %}
<li><a href="https://twitter.com/share" data-url="{{ page.url(true) }}" data-text="{{ page.title }}" class="icon brands fa-twitter">
</a></li>
<li><a href="http://www.facebook.com/sharer.php?u={{ page.url(true) }}" class="icon brands fa-facebook">
</a></li>
</ul>
</footer>
</article> </article>