Disroot-themes/grav-theme-disroot
Disroot-themes
/
grav-theme-disroot
7
2
Fork 0
Code Pull Requests Releases Activity

two_col_fix #22

Manually merged
antilopa merged 3 commits from two_col_fix into master 2020-01-08 22:28:07 +01:00
Conversation 0 Commits 3 Files Changed 12 +110 -52
12 changed files with 110 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/defaults.css
View File

@ -531,12 +531,20 @@ input::-moz-focus-inner {
------------------------------------*/
.button5 {
background-color: #4e2230;
height: 35px;
color:white;
padding: 1.5% 2.5%;
border-radius: 15px;
border-radius: 5px;
text-decoration: none;
}
.button5:hover {
color: #3d4145;
}
.button5:visited {
color: white;
}
/* Forms */

11
css/style.css
View File

@ -522,6 +522,14 @@ ul#nav li a:hover .ul#nav li ul {
font-weight: bold;
}
.two-col .columns:first-of-type.five {
margin-right: 8%;
}
.two-col .columns:last-of-type.five {
margin-left: 8%;
}
/* three-col */
.three-col {
@ -549,8 +557,7 @@ ul#nav li a:hover .ul#nav li ul {
/* fullbar */
.fullbar {
padding: 0px;
padding-bottom: 80px;
padding: 40px 0px;
text-align: center;
transform: skew(0deg, 1deg) translateY(-10px);
margin-top: -60px;

BIN
images/favicon.org
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

BIN
images/favicon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 10 KiB

19
templates/de/partials/footer.html.twig Normal file
View File

@ -0,0 +1,19 @@
<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>

19
templates/es/partials/footer.html.twig Normal file
View File

@ -0,0 +1,19 @@
<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>

19
templates/fr/partials/footer.html.twig Normal file
View File

@ -0,0 +1,19 @@
<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>

19
templates/it/partials/footer.html.twig Normal file
View File

@ -0,0 +1,19 @@
<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>

23
templates/modular/2col-left.html.twig
View File

@ -1,23 +0,0 @@
<div class="two-col" style="background-color:{{ page.header.bgcolor }};">
<div class="two-col-content" style="color:{{ page.header.fontcolor }}; text-align:{{ page.header.text_align }};" >
{% block content %}
{% set colsize = ['six', 'five'] %}
<section id="{{ page.header.section_id }}" class="two-col">
<div class="row">
{% for key, column in page.content|split('<hr />') %}
<div class="{{ colsize[key] }} columns">
{{ column }}
{% if page.header.cloudclients %}
{% if colsize[key] == 'six' %}
{% include 'modular/cloudclients.html.twig' %}
{% endif %}
{% endif %}
</div>
{% endfor %}
</div>
</section>
{% endblock %}
</div>
</div>

23
templates/modular/2col-right.html.twig
View File

@ -1,23 +0,0 @@
<div class="two-col" style="background-color:{{ page.header.bgcolor }};">
<div class="two-col-content" style="color:{{ page.header.fontcolor }}; text-align:{{ page.header.text_align }}; word-wrap: break-word;">
{% block content %}
{% set colsize = ['five', 'six'] %}
<section id="{{ page.header.section_id }}" class="two-col">
<div class="row">
{% for key, column in page.content|split('<hr />') %}
<div class="{{ colsize[key] }} columns">
{{ column }}
{% if page.header.cloudclients %}
{% if colsize[key] == 'six' %}
{% include 'modular/cloudclients.html.twig' %}
{% endif %}
{% endif %}
</div>
{% endfor %}
</div>
</section>
{% endblock %}
</div>
</div>

17
templates/modular/2col.html.twig
View File

@ -1,13 +1,26 @@
<div class="two-col" style="background-color:{{ page.header.bgcolor }};">
<div class="two-col-content" style="color:{{ page.header.fontcolor }}; text-align:{{ page.header.text_align }};" >
<div class="two-col-content" style="color:{{ page.header.fontcolor }}; text-align:{{ page.header.text_align }}; word-wrap: break-word;" >
{% block content %}
{% set colsize = ['five', 'five'] %}
{% if page.header.wider_column == 'left' %}
{% set colsize = ['six', 'five'] %}
{% elseif page.header.wider_column == 'right' %}
{% set colsize = ['five', 'six'] %}
{% else %}
{% set colsize = ['six', 'six'] %}
{% endif %}
<section id="{{ page.header.section_id }}" class="two-col">
<div class="row">
{% for key, column in page.content|split('<hr />') %}
<div class="{{ colsize[key] }} columns">
{{ column }}
{% if page.header.cloudclients %}
{% if colsize[key] == 'six' %}
{% include 'modular/cloudclients.html.twig' %}
{% endif %}
{% endif %}
</div>
{% endfor %}
</div>

2
templates/modular/cloudclients.html.twig
View File

@ -1,6 +1,6 @@
<div class=NCclients>
<h5>{{ page.header.text2 }}</h5>
<h5>{{ page.header.clients_title }}</h5>
<div class="clients">
{% for item in page.header.clients %}