mirror of
https://github.com/pmoreno-rodriguez/grav-theme-future2021.git
synced 2025-07-03 00:28:55 +00:00
Merge pull request #10 from pmoreno-rodriguez/develop
Revert "Harmonize and modify twigs"
This commit is contained in:
pmoreno.rodriguez
GitHub
commit
92ee80bbf7
8 changed files with 212 additions and 172 deletions
|
|
@ -2635,8 +2635,8 @@ table.alt tfoot {
|
|||
text-transform: uppercase;
|
||||
display: block;
|
||||
border-bottom: none;
|
||||
padding: 0.5rem 0.8rem;
|
||||
line-height: 1.5em;
|
||||
padding: 0.3rem 0.8rem;
|
||||
line-height: 2.5em;
|
||||
}
|
||||
#header .dropdown li ul li a:hover {
|
||||
color: #181818;
|
||||
|
|
@ -3004,6 +3004,19 @@ body.single #wrapper {
|
|||
position: relative;
|
||||
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 {
|
||||
display: block;
|
||||
margin-left: -0.25em;
|
||||
|
|
|
|||
2
assets/css/main.min.css
vendored
2
assets/css/main.min.css
vendored
File diff suppressed because one or more lines are too long
|
|
@ -1,19 +1,19 @@
|
|||
/* Dropdown menu in header */
|
||||
|
||||
#header {
|
||||
|
||||
|
||||
.dropdown {
|
||||
@include vendor('flex', '1');
|
||||
border-left: solid 1px _palette(border);
|
||||
height: inherit;
|
||||
line-height: inherit;
|
||||
margin-left: _size(section-spacing-small);
|
||||
margin-left: _size(section-spacing-small);
|
||||
li {
|
||||
position: relative;
|
||||
float: left;
|
||||
text-transform: uppercase;
|
||||
font-size: 12pt;
|
||||
height: inherit;
|
||||
height: inherit;
|
||||
a {
|
||||
font-family: _font(family-heading);
|
||||
font-size: 0.8em;
|
||||
|
|
@ -22,8 +22,8 @@
|
|||
@include vendor('display', 'block');
|
||||
border-bottom: none;
|
||||
padding: 0 0.8rem;
|
||||
height: inherit;
|
||||
|
||||
height: inherit;
|
||||
|
||||
}
|
||||
ul {
|
||||
position: absolute;
|
||||
|
|
@ -35,9 +35,9 @@
|
|||
line-height: normal;
|
||||
background-color: _palette(bg-dropdown);
|
||||
box-shadow: 0 0.05rem 1rem _palette(border-dropdown) !important;
|
||||
|
||||
|
||||
li {
|
||||
|
||||
|
||||
a {
|
||||
font-family: _font(family-heading);
|
||||
font-size: 0.8em;
|
||||
|
|
@ -46,25 +46,25 @@
|
|||
text-transform: uppercase;
|
||||
@include vendor('display', 'block');
|
||||
border-bottom: none;
|
||||
padding: 0.5rem 0.8rem;
|
||||
line-height: 1.5em;
|
||||
padding: 0.3rem 0.8rem;
|
||||
line-height: 2.5em;
|
||||
|
||||
&:hover {
|
||||
color: #181818;
|
||||
}
|
||||
}
|
||||
}
|
||||
ul {
|
||||
left: 100%;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
ul {
|
||||
li {
|
||||
|
||||
|
||||
margin-left: 0.5em;
|
||||
padding-left: 0.5em;
|
||||
|
||||
|
|
@ -84,14 +84,14 @@
|
|||
background-color: _palette(bg);
|
||||
box-shadow: 0 0.05rem 1rem _palette(border-dropdown) !important;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@include breakpoint('<=medium') {
|
||||
.dropdown {
|
||||
display: none;
|
||||
}
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
@include breakpoint('<=small') {
|
||||
.dropdown {
|
||||
|
|
|
|||
|
|
@ -15,6 +15,20 @@
|
|||
position: relative;
|
||||
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 {
|
||||
display: block;
|
||||
margin-left: -0.25em;
|
||||
|
|
|
|||
|
|
@ -1,51 +1,49 @@
|
|||
{% extends 'partials/base.html.twig' %}
|
||||
{% embed 'partials/base.html.twig' %}
|
||||
|
||||
{% set collection = page.collection() %}
|
||||
{% set base_url = page.url %}
|
||||
{% set feed_url = base_url %}
|
||||
{% if page.header.show_breadcrumbs is defined %}
|
||||
{% set collection = page.collection() %}
|
||||
{% set base_url = page.url %}
|
||||
{% set feed_url = base_url %}
|
||||
{% if page.header.show_breadcrumbs is defined %}
|
||||
{% set show_breadcrumbs = page.header.show_breadcrumbs %}
|
||||
{% else %}
|
||||
{% set show_breadcrumbs = true %}
|
||||
{% endif %}
|
||||
{% if page.header.show_pagination is defined %}
|
||||
{% set show_pagination = page.header.show_pagination %}
|
||||
{% else %}
|
||||
{% set show_pagination = true %}
|
||||
{% endif %}
|
||||
{% else %}
|
||||
{% set show_breadcrumbs = true %}
|
||||
{% endif %}
|
||||
{% if page.header.show_pagination is defined %}
|
||||
{% set show_pagination = page.header.show_pagination %}
|
||||
{% else %}
|
||||
{% set show_pagination = true %}
|
||||
{% endif %}
|
||||
|
||||
{% if base_url == '/' %}
|
||||
{% if 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 %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% block menu %}
|
||||
{% 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 %}
|
||||
{#
|
||||
{% 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} %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
|
||||
{% include 'partials/breadcrumbs.html.twig' %}
|
||||
{% 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 %}
|
||||
{% for child in collection %}
|
||||
{% include 'partials/blog_item.html.twig' with {'page':child, 'truncate':true} %}
|
||||
{% 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 %}
|
||||
|
|
|
|||
|
|
@ -1,33 +1,34 @@
|
|||
{% 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 %}
|
||||
{% include 'partials/sidebar_right.html.twig' %}
|
||||
{% include 'partials/sidebar_right.html.twig' %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
|
||||
{% include 'partials/breadcrumbs.html.twig' %}
|
||||
{% endif %}
|
||||
<article class="post">
|
||||
<header>
|
||||
<div class="title">
|
||||
<h2>{{ page.header.title }}</h2>
|
||||
{% if page.header.subtitle %}
|
||||
<p>{{ page.header.subtitle }}</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<article class="post">
|
||||
<header>
|
||||
<div class="title">
|
||||
<h2>{{ page.header.title }}</h2>
|
||||
{% if page.header.subtitle %}
|
||||
<p>{{ page.header.subtitle }}</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</header>
|
||||
{{ page.content|raw }}
|
||||
</article>
|
||||
|
||||
<section id="footer" class="align-center">
|
||||
{% include 'partials/footer.html.twig' %}
|
||||
</section>
|
||||
</header>
|
||||
{% if page.header.primaryImage %}
|
||||
{{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}
|
||||
{% else %}
|
||||
{{ page.media.images|first.cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}
|
||||
{% endif %}
|
||||
{{ page.content|raw}}
|
||||
|
||||
</article>
|
||||
<section id="footer" class="align-center">
|
||||
{% block footer %}
|
||||
{% include 'partials/footer.html.twig' %}
|
||||
{% endblock %}
|
||||
</section>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
{% set show_breadcrumbs = page.header.show_breadcrumbs %}
|
||||
{% 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' %}
|
||||
{% if base_url == '/' %}
|
||||
{% set base_url = '' %}
|
||||
{% 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">
|
||||
{% include 'partials/footer.html.twig' %}
|
||||
</section>
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
|
||||
{% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
|
||||
{% 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 %}
|
||||
|
|
|
|||
|
|
@ -1,87 +1,93 @@
|
|||
<article class="post" itemprop="liveBlogUpdate" itemscope itemtype="http://schema.org/BlogPosting">
|
||||
{% if page.header.author %}
|
||||
{% set author = page.header.author %}
|
||||
{% else %}
|
||||
{% set author = page.header.taxonomy.author[0] %}
|
||||
{% endif %}
|
||||
{% if author %}
|
||||
{% set avatar = author|replace(' ', '-')|lower %}
|
||||
{% endif %}
|
||||
|
||||
<header>
|
||||
<article class="post" itemprop="liveBlogUpdate" itemscope itemtype="http://schema.org/BlogPosting">
|
||||
{% if page.header.author %}
|
||||
{% set author = page.header.author %}
|
||||
{% else %}
|
||||
{% set author = page.header.taxonomy.author[0] %}
|
||||
{% endif %}
|
||||
{% if author %}
|
||||
{% set avatar = author|replace(' ', '-')|lower %}
|
||||
{% endif %}
|
||||
|
||||
<header>
|
||||
<div class="title">
|
||||
{% if page.header.link %}
|
||||
<h2 itemprop="headline">
|
||||
{% if page.header.continue_link is not sameas(false) %}
|
||||
<a href="{{ page.url }}"></a>
|
||||
{% if page.header.link %}
|
||||
<h2 itemprop="headline">
|
||||
{% if page.header.continue_link is not sameas(false) %}
|
||||
<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 %}
|
||||
<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 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>
|
||||
{% 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>
|
||||
{% endif %}
|
||||
<time class="published" itemprop="datePublished" datetime="{{page.date|date("Y-m-d")}}">{{ page.date|date("M j, Y")}}</time>
|
||||
{% 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>
|
||||
{% endif %}
|
||||
</div>
|
||||
</header>
|
||||
</header>
|
||||
|
||||
{% 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>
|
||||
{% elseif page.media.images %}
|
||||
<a href="{{ page.url }}" class="image featured">{{ page.media.images|first.cropZoom(1038,437).loading('lazy').html(page.title, page.title)|raw }}</a>
|
||||
{% endif %}
|
||||
{% 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, 'image featured')|raw }}</a>
|
||||
{% else %}
|
||||
<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 %}
|
||||
|
||||
{% if page.header.blog_hide_body is not defined or not page.header.blog_hide_body %}
|
||||
<div itemprop="articleBody">
|
||||
{% if page.header.continue_link is sameas(false) %}
|
||||
{{ page.content|raw }}
|
||||
{% if not truncate %}
|
||||
{% set show_prev_next = true %}
|
||||
{% endif %}
|
||||
{% elseif truncate and page.summary != page.content %}
|
||||
{{ page.summary|raw }}
|
||||
{% elseif truncate %}
|
||||
{{ page.content|truncate(550)|raw }}
|
||||
{% else %}
|
||||
{{ page.content|raw }}
|
||||
{% set show_prev_next = true %}
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div itemprop="articleBody">
|
||||
|
||||
{% if page.header.continue_link is sameas(false) %}
|
||||
{{ page.content|raw }}
|
||||
{% if not truncate %}
|
||||
{% set show_prev_next = true %}
|
||||
{% endif %}
|
||||
{% elseif truncate and page.summary != page.content %}
|
||||
{{ page.summary|raw }}
|
||||
{% elseif truncate %}
|
||||
{{ page.content|truncate(550)|raw }}
|
||||
{% else %}
|
||||
{{ page.content|raw }}
|
||||
{% set show_prev_next = true %}
|
||||
{% endif %}
|
||||
|
||||
<footer>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<ul class="actions">
|
||||
{% 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 %}
|
||||
<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 %}
|
||||
|
||||
{% if show_prev_next %}
|
||||
{% 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>
|
||||
{% endif %}
|
||||
{% 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>
|
||||
{% endif %}
|
||||
{% 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>
|
||||
{% endif %}
|
||||
{% 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>
|
||||
{% 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>
|
||||
</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>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue