Compare commits

..

No commits in common. "main" and "add_rss_button_to_blog" have entirely different histories.

24 changed files with 216 additions and 208 deletions

View File

@ -1,18 +1,3 @@
# v1.2.1
## 01/19/2021
1. [](#improved)
* Fixed autoescaping in preparation for Grav 1.7
# v1.2.0
## 03/21/2019
1. [](#new)
* Set Dependency of Grav 1.5.10+ which has support for new **Deferred Block** Twig extension
* Implement assets rendering using **Deferred Block** Twig extension
1. [](#improved)
* Added twig `t` filter for submit button translation in comments form
# v1.1.0
## 07/14/2016
@ -22,7 +7,7 @@
* Use https for Gravatar request as default
1. [](#bugfix)
* Fix setting the page language in the html tag
* Fixed pagination
* Fixed pagination
* Use the correct parameter separator in the blog post template
# v1.0.1

View File

@ -1,7 +1,5 @@
name: disrootblog
slug: disrootblog
type: theme
version: 1.2.1
version: 1.1.0
description: "A clean and simple theme for bloggers, with responsive design and beautiful typography."
icon: group
author:
@ -13,5 +11,3 @@ demo: http://demo.getgrav.org/lingonberry-skeleton
keywords: lingonberry, theme, onepage, modern, fast, responsive, html5, css3
bugs: https://github.com/getgrav/grav-theme-lingonberry/issues
license: GPL
dependencies:
- { name: grav, version: '>=1.5.10' }

View File

@ -6,7 +6,6 @@
letter-spacing: 0.5px;
margin-bottom: 0px;
height: 100%;
font-size: 10px;
}
footer div#footer-links ul li {
@ -14,15 +13,9 @@
padding-right: 5px;
}
footer #footer-links {
text-align: center;
width: 100%;
}
/* Icons */
footer #footer-icons { display: none; }
/*footer #footer-logo { display: none; }*/
footer #footer-left { display: none; }
footer #footer-logo { display: none; }
/* Go To Top Button */
#go-top { margin-left: -22px; }
@ -32,4 +25,4 @@
font-size: 18px;
line-height: 54px;
}
}
}

View File

@ -94,6 +94,12 @@ body {
font-family: 'Lato', 'Helvetica Neue', sans-serif;
font-size: 16px;
-ms-word-break: break-all;
word-break: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto;
}
body a {
@ -1729,51 +1735,19 @@ footer {
justify-content: center;
text-align: center;
align-items: center;
height: 82px;
}
/* there is no logo anymore in the footer
* TODO: d-white.png should probably be removed since is not used elsewhere
footer #footer-logo {
background: url("../images/d-white.png") no-repeat center;
background-size: contain;
margin-bottom: 0;
margin-left: 1dvw;
height: 45px;
width: 15%;
background: url("../images/d-white.png") no-repeat left center;
background-size: 40px 40px;
margin-left: 30px;
opacity: 0.7;
display: inline-block;
}
*/
footer #footer-left {
display: flex;
width: 150px;
background: transparent;
align-items: center;
margin-left: 10px;
}
#footer-copyleft {
background: url("../images/by-sa.png") no-repeat center;
background-size: contain;
margin-bottom: 0;
margin-left: 1dvw;
opacity: 0.7;
}
/* there is no logo anymore in the footer
#footer-logo a {
display: flex;
width: 45px;
height: 45px;
margin-bottom: 0;
}
*/
#footer-copyleft a {
display: flex;
width: 120px;
height: 40px;
margin-bottom: 0;
}
footer .dot {
height: 5px;
width: 5px;
@ -1782,84 +1756,71 @@ footer #footer-left {
display: inline-block;
margin-bottom: 2px;
}
footer #footer-links {
text-align: center;
width: calc(100% - 300px);
width: 60%;
}
footer ul.footer-links {
display: flex;
justify-content: space-evenly;
justify-content: center;
align-items: center;
padding-left: 10%;
padding-right: 10%;
padding-left: 0;
margin-bottom: 24px;
margin-top: 12px;
word-break: normal;
}
footer ul.footer-icons-left {
display: inline-flex;
width: 100%;
justify-content: left;
align-items: center;
margin: 0;
padding: 0;
}
footer ul.footer-icons-right{
display: inline-flex;
width: 100%;
justify-content: right;
align-items: center;
margin: 0;
padding: 0;
}
footer ul.footer-icons {
display: flex;
justify-content: end;
margin-right: 30px;
align-items: center;
}
footer div#footer-links ul li {
padding-left: 8px;
padding-right: 8px;
padding-left: 20px;
padding-right: 20px;
margin: 0;
padding-top: 13px;
font-weight: 600;
text-align: center;
line-height: 1.5em;
}
footer #footer-links a {
color: #b9a2ab;
}
footer #footer-links a:hover {
color: #FFFFFF;
}
footer #footer-icons {
width: 150px;
width: 25%;
background: transparent;
margin-left: auto;
margin-right: 10px;
margin-right: auto;
text-align: center;
margin-bottom: 24px;
margin-top: 12px;
}
footer #footer-icons ul li {
margin: 0;
margin-right: 1dvw;;
text-align: center;
padding-right: 10px;
padding-top: 10px;
text-align: right;
}
footer #footer-icons ul li .fa-fw {
display: flex;
color: white;
opacity: 0.7;
height: 45px;
align-items: center;
}
footer #footer-icons ul li .fa-fw:hover {
color: white;
opacity: 1;
}
footer a, footer a:visited { color: #FFFFFF; }
footer a:hover, footer a:focus { color: #1F5C60; }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -1,24 +0,0 @@
en:
Terms_Of_Service: "Terms Of Service"
Privacy_Policy: "Privacy Policy"
Changelog: "Change­log"
fr:
Terms_Of_Service: "Conditions d'utilisation"
Privacy_Policy: "Politique de confidentialité"
Changelog: "Change­log"
es:
Terms_Of_Service: "Al utilizar cualquiera"
Privacy_Policy: "Política de Privacidad"
Changelog: "Change­log"
de:
Terms_Of_Service: "Nutzungs­bedingungen"
Privacy_Policy: "Datenschutz­erklärung"
Changelog: "Change­log"
it:
Terms_Of_Service: "Utilizzando i servizi"
Privacy_Policy: "Informativa sulla privacy"
Changelog: "Change­log"

View File

@ -14,7 +14,7 @@
{% block content %}
{{ page.content|raw }}
{{ page.content }}
{% for child in collection %}
{% include 'partials/blog_item.html.twig' with {'page':child, 'truncate':true} %}
{% endfor %}

View File

@ -0,0 +1,21 @@
{% set base_url = page.parent.url %}
<footer>
<div id="footer-logo" ><a href="{{ base_url }}/contact"></a></div>
<div id="footer-links">
<ul class="footer-links">
<li>Copyleft Disroot.org</li>
<li><span class="dot"></span></li>
<li><a href="{{ base_url }}/tos">Nutzungsbedingungen</a></li>
<li><span class="dot"></span></li>
<li><a href="{{ base_url }}/privacy_policy">Datenschutzerklärung</a></li>
</ul>
</div>
<div id="footer-icons">
<ul class="footer-icons">
<li><a href="https://hub.disroot.org/channel/disroot"><i class="fa fa-hubzilla fa-fw fa-3x"></i></a></li>
<li><a href="https://social.weho.st/@disroot"><i class="fa fa-mastodon fa-fw fa-3x"></i></a></li>
<li><a href="{{ base_url }}/blog.atom"><i class="fa fa-rss-square fa-fw fa-3x"></i></a></li>
</ul>
</div>
</footer>

View File

@ -7,7 +7,7 @@
<h2 class="post-title">{{ page.header.title }}</h2>
</div>
<div class="post-content">
{{ page.content|raw }}
{{ page.content }}
</div>
<div class="clear"></div>
</div>

View File

@ -7,7 +7,7 @@
<h2 class="post-title">Error {{ page.header.http_response_code }}</h2>
</div>
<div class="post-content">
{{ page.content|raw }}
{{ page.content }}
</div>
<div class="clear"></div>
</div>

View File

@ -0,0 +1,21 @@
{% set base_url = page.parent.url %}
<footer>
<div id="footer-logo" ><a href="{{ base_url }}/contact"></a></div>
<div id="footer-links">
<ul class="footer-links">
<li>Copyleft Disroot.org</li>
<li><span class="dot"></span></li>
<li><a href="{{ base_url }}/tos">Al utilizar cualquiera</a></li>
<li><span class="dot"></span></li>
<li><a href="{{ base_url }}/privacy_policy">Política de Privacidad</a></li>
</ul>
</div>
<div id="footer-icons">
<ul class="footer-icons">
<li><a href="https://hub.disroot.org/channel/disroot"><i class="fa fa-hubzilla fa-fw fa-3x"></i></a></li>
<li><a href="https://social.weho.st/@disroot"><i class="fa fa-mastodon fa-fw fa-3x"></i></a></li>
<li><a href="{{ base_url }}/blog.atom"><i class="fa fa-rss-square fa-fw fa-3x"></i></a></li>
</ul>
</div>
</footer>

View File

@ -7,7 +7,7 @@
<h2 class="post-title">{{ page.header.title }}</h2>
</div>
<div class="post-content">
{{ content|raw }}
{{ content }}
</div>
{% if config.plugins.form.enabled %}
{% include "forms/form.html.twig" %}

View File

@ -7,7 +7,7 @@
<h2 class="post-title">{{ form.message }}</h2>
</div>
<div class="post-content">
{{ content|raw }}
{{ content }}
</div>
{% if config.plugins.form.enabled %}
{% include "forms/data.html.twig" %}

View File

@ -0,0 +1,21 @@
{% set base_url = page.parent.url %}
<footer>
<div id="footer-logo" ><a href="{{ base_url }}/contact"></a></div>
<div id="footer-links">
<ul class="footer-links">
<li>Copyleft Disroot.org</li>
<li><span class="dot"></span></li>
<li><a href="{{ base_url }}/tos">Conditions d'utilisation</a></li>
<li><span class="dot"></span></li>
<li><a href="{{ base_url }}/privacy_policy">Politique de confidentialité</a></li>
</ul>
</div>
<div id="footer-icons">
<ul class="footer-icons">
<li><a href="https://hub.disroot.org/channel/disroot"><i class="fa fa-hubzilla fa-fw fa-3x"></i></a></li>
<li><a href="https://social.weho.st/@disroot"><i class="fa fa-mastodon fa-fw fa-3x"></i></a></li>
<li><a href="{{ base_url }}/blog.atom"><i class="fa fa-rss-square fa-fw fa-3x"></i></a></li>
</ul>
</div>
</footer>

View File

@ -0,0 +1,21 @@
{% set base_url = page.parent.url %}
<footer>
<div id="footer-logo" ><a href="{{ base_url }}/contact"></a></div>
<div id="footer-links">
<ul class="footer-links">
<li>Copyleft Disroot.org</li>
<li><span class="dot"></span></li>
<li><a href="{{ base_url }}/tos">Utilizzando i servizi</a></li>
<li><span class="dot"></span></li>
<li><a href="{{ base_url }}/privacy_policy">Informativa sulla privacy</a></li>
</ul>
</div>
<div id="footer-icons">
<ul class="footer-icons">
<li><a href="https://hub.disroot.org/channel/disroot"><i class="fa fa-hubzilla fa-fw fa-3x"></i></a></li>
<li><a href="https://social.weho.st/@disroot"><i class="fa fa-mastodon fa-fw fa-3x"></i></a></li>
<li><a href="{{ base_url }}/blog.atom"><i class="fa fa-rss-square fa-fw fa-3x"></i></a></li>
</ul>
</div>
</footer>

View File

@ -2,53 +2,50 @@
<html lang="{{ grav.language.getLanguage ?: 'en' }}">
<head>
{% block head %}
<meta charset="utf-8" />
<title>{% if header.title %}{{ header.title }} | {% endif %}{{ site.title }}</title>
{% include 'partials/metadata.html.twig' %}
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<link rel="icon" type="image/png" href="{{ url('theme://images/favicon.ico') }}" />
<meta charset="utf-8" />
<title>{% if header.title %}{{ header.title }} | {% endif %}{{ site.title }}</title>
{% include 'partials/metadata.html.twig' %}
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<link rel="icon" type="image/png" href="{{ theme_url }}/images/favicon.ico" />
<!--link rel='stylesheet' id='lingonberry_googleFonts-css' href='//fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic%7CRaleway%3A600%2C500%2C400&#038;ver=4.3.1' type='text/css' media='all' /-->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css" integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin="anonymous">
{% block stylesheets %}
{% do assets.addCss('theme://css/widget.css') %}
{% do assets.addCss('theme://css/style.css') %}
{% block stylesheets %}
{% do assets.addCss('theme://css/widget.css') %}
{% do assets.addCss('theme://css/style.css') %}
{% do assets.addCss('theme://css/media-queries.css') %}
{% do assets.addCss('theme://css/content.css') %}
{% do assets.addCss('theme://css/sidebar.css') %}
{% do assets.addCss('theme://css/lightbox.css') %}
{% if browser.getBrowser == 'msie' and browser.getVersion >= 7 and browser.getVersion <= 8 %}
{% do assets.addCss('theme://css/ie.css') %}
{% endif %}
{% endblock %}
{% do assets.addCss('theme://css/content.css') %}
{% do assets.addCss('theme://css/sidebar.css') %}
{% do assets.addCss('theme://css/lightbox.css') %}
{% if browser.getBrowser == 'msie' and browser.getVersion >= 7 and browser.getVersion <= 8 %}
{% do assets.addCss('theme://css/ie.css') %}
{% endif %}
{% endblock %}
{{ assets.css() }}
{% block javascripts %}
{% do assets.add('jquery',101) %}
{% endblock %}
{% block javascripts %}
{% do assets.add('jquery',101) %}
{% endblock %}
{{ assets.js() }}
{% if site.calendar %}
<script src="//code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
<script type="text/javascript">
$(function() {
$( "#calendar_wrap" ).datepicker({
hideIfNoPrevNext: true
{% if site.calendar %}
<script src="//code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
<script type="text/javascript">
$(function() {
$( "#calendar_wrap" ).datepicker({
hideIfNoPrevNext: true
});
});
});
</script>
{% endif %}
{% block assets deferred %}
{{ assets.css()|raw }}
{{ assets.js()|raw }}
{% endblock %}
</script>
{% endif %}
{% endblock head %}
</head>
<body class="{{ page.header.body_classes }}">
{% block navigation %}
{% include 'partials/navigation.html.twig' %}
{% include 'partials/navigation.html.twig' %}
{% endblock %}
{% block header %}
{% include 'partials/header.html.twig' %}
@ -65,14 +62,8 @@
{% block footer %}
{% include 'partials/footer.html.twig' %}
{% endblock %}
<script type='text/javascript' src='{{ theme_url }}/js/flexslider.min.js'></script>
<script type='text/javascript' src='{{ theme_url }}/js/global.js'></script>
{% block bottomscripts %}
{% do assets.addJs('theme://js/flexslider.min.js', { group: 'bottom' }) %}
{% do assets.addJs('theme://js/global.js', { group: 'bottom' }) %}
{% endblock %}
{% block bottom %}
{{ assets.js('bottom')|raw }}
{% endblock %}
</body>
</html>
</body>
</html>

View File

@ -53,7 +53,7 @@
<iframe width="100%" height="403" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/{{ page.header.soundcloud }}&amp;auto_play=false&amp;hide_related=true&amp;show_comments=true&amp;show_user=true&amp;show_reposts=false&amp;visual=true&amp;buying=false"></iframe>
{% endif %}
{% if page.media.images|first and not page.header.slideshow %}
{{ page.media.images|first.cropZoom(750,422).html('','', 'thumb')|raw }}
{{ page.media.images|first.cropZoom(750,422).html('','', 'thumb') }}
{% endif %}
{% if page.header.description %}
<div class="media-caption-container">
@ -100,7 +100,7 @@
<span class="date-sep"> / </span>
{% if page.taxonomy.tag %}
{% for tag in page.taxonomy.tag %}
<a href="{{ base_url }}/tag{{ config.system.param_sep }}{{ tag }}" rel="tag">{{ tag }}{% if not loop.last %}, {% endif %}</a>
<a href="{{ base_url }}/tag:{{ tag }}" rel="tag">{{ tag }}{% if not loop.last %}, {% endif %}</a>
{% endfor %}
{% endif %}
</div>
@ -111,16 +111,16 @@
<div class="post-content">
{% if page.header.type != 'quote' and page.header.type != 'video' and page.header.type != 'link' and page.header.type != 'chat' and page.header.type != 'aside' %}
{% if page.header.continue_link is sameas(false) %}
{{ page.content|raw }}
{{ page.content }}
{% if not truncate %}
{% set show_prev_next = true %}
{% endif %}
{% elseif truncate and page.summary != page.content %}
{{ page.summary|raw }}
{{ page.summary }}
{% elseif truncate %}
{{ page.content|truncate(550)|raw }}
{{ page.content|truncate(550) }}
{% else %}
{{ page.content|raw }}
{{ page.content }}
{% set show_prev_next = true %}
{% endif %}
<p>
@ -131,7 +131,7 @@
{% endif %}
</p>
{% else %}
{{ page.content|raw }}
{{ page.content }}
{% endif %}
</div>
</div>

View File

@ -41,7 +41,7 @@
<p class="form-submit">
{% for button in grav.config.plugins.comments.form.buttons %}
<button class="submit" type="{{ button.type|default('submit') }}">{{ button.value|t|default('Post Comment') }}</button>
<button class="submit" type="{{ button.type|default('submit') }}">{{ button.value|default('Post Comment') }}</button>
{% endfor %}
</p>

View File

@ -6,26 +6,21 @@
</div>
</div>
<footer>
<div id="footer-left">
<ul class="footer-icons-left">
<div id="footer-copyleft"><a href="https://git.disroot.org/Disroot/Website#license"></a></div>
</ul>
</div>
<div id="footer-logo" ><a href="{{ base_url }}/contact"></a></div>
<div id="footer-links">
<ul class="footer-links">
<li><a href="{{ base_url }}/tos">{{ 'Terms_Of_Service'|t }}</a></li>
<li>Copyleft Disroot.org</li>
<li><span class="dot"></span></li>
<li><a href="{{ base_url }}/privacy_policy">{{ 'Privacy_Policy'|t }}</a></li>
<li><a href="{{ base_url }}/tos">Terms Of Service</a></li>
<li><span class="dot"></span></li>
<li><a href="{{ base_url }}/changelog">{{ 'Changelog'|t }}</a></li>
<li><span class="dot"></span></li>
<li><a href="{{ base_url }}/tor">{{ 'Tor Onion'|t }}</a></li>
<li><a href="{{ base_url }}/privacy_policy">Privacy Policy</a></li>
</ul>
</div>
<div id="footer-icons">
<ul class="footer-icons-right">
<li><a href="https://nixnet.social/disroot"><i class="fa fa-mastodon fa-fw fa-3x"></i></a></li>
<li><a href="{{ base_url }}/blog.atom"><i class="fa fa-rss-square fa-fw fa-3x"></i></a></li>
<ul class="footer-icons">
<li><a href="https://hub.disroot.org/channel/disroot"><i class="fa fa-hubzilla fa-fw fa-3x"></i></a></li>
<li><a href="https://social.weho.st/@disroot"><i class="fa fa-mastodon fa-fw fa-3x"></i></a></li>
<li><a href="{{ base_url }}/blog.atom"><i class="fa fa-rss-square fa-fw fa-3x"></i></a></li>
</ul>
</div>
</footer>

View File

@ -3,7 +3,7 @@
{% if related %}
<div class="item-img">
{% if related.media.images|first %}
{{ related.media.images|first.forceResize(230,160).html|raw }}
{{ related.media.images|first.forceResize(230,160).html }}
{% else %}
<a href="{{ related.url }}" title="{{ related.title }}">
<img src='' title="{{ related.title }}" alt="{{ related.title }}" style="width:222px;height:154px;">

View File

@ -20,7 +20,7 @@
{% elseif percent >= 50 and percent < 80 %}
{% set class = 'large' %}
{% endif %}
<span class="{{ class }}" title="{{ value }} posts"><a href="/blog/tag{{ config.system.param_sep }}{{ tax|e('url') }}">{{ tax }}</a></span>
<span class="{{ class }}" title="{{ value }} posts"><a href="{{ base_url }}/tag{{ config.system.param_sep }}{{ tax|e('url') }}">{{ tax }}</a></span>
{% endif %}
{% endfor %}
</div>

View File

@ -0,0 +1,27 @@
{% set taxlist = taxonomylist.get() %}
{% if taxlist %}
{% set max = max(taxlist['tag']) %}
{% set threshold = 0 %}
{% if config.plugins.tagcloud.threshold is defined %}
{% set threshold = config.plugins.tagcloud.threshold %}
{% endif %}
<div id="tagcloud">
{% for tax,value in taxlist['tag']|ksort %}
{% set percent = (value / max) * 100 %}
{% if percent > threshold %}
{% set class = 'largest' %}
{% if percent < 20 %}
{% set class = 'smallest' %}
{% elseif percent >= 20 and percent < 40 %}
{% set class = 'small' %}
{% elseif percent >= 40 and percent < 60 %}
{% set class = 'medium' %}
{% elseif percent >= 50 and percent < 80 %}
{% set class = 'large' %}
{% endif %}
<span class="{{ class }}" title="{{ value }} posts"><a href="{{ base_url }}/tag{{ config.system.param_sep }}{{ tax|e('url') }}">{{ tax }}</a></span>
{% endif %}
{% endfor %}
</div>
{% endif %}