Commit e751ffa1 authored by Jessé Vermeulen's avatar Jessé Vermeulen

Merge branch 'allan-master' into 'master'

merge allan-master into master

See merge request bitsoffreedom/timetodisagree.eu!9
parents 687f7841 b317e5f8
Pipeline #1512 passed with stage
in 2 seconds
......@@ -17,7 +17,7 @@
<div class="coordinators">
<a href="https://www.bof.nl/" target="_blank" title="Bits of Freedom"><img src="/wp-content/images/logos/bof.png" alt="Bits of Freedom"></a>
<a href="https://www.edri.org/" target="_blank" title="European Digital Rights"><img src="/wp-content/images/logos/edri.png" alt="European Digital Rights"></a>
<a href="https://en.panoptykon.org/" target="_blank" title="Fundacja Panoptykon"><img src="/wp-content/images/logos/panoptykon.png" alt="Fundacja Panoptykon"></a>
<a href="<?php echo pll__('https://panoptykon.org/') ?>" target="_blank" title="<?php echo pll__('Panoptykon Foundation')?>"><img src="/wp-content/images/logos/<?php echo pll__('panoptykon_en') ?>.png" alt="<?php echo pll__('Panoptykon Foundation')?>"></a>
<?php if ( has_nav_menu( 'footer' ) ) : ?>
<?php wp_nav_menu( array( 'theme_location' => 'footer', 'depth' => 1, 'container_class' => 'footer-links' ) ); ?>
......@@ -32,10 +32,17 @@
<a href="https://www.digitalrights.ie/" target="_blank" title="Digital Rights Ireland"><img src="/wp-content/images/logos/dri.png" alt="Digital Rights Ireland"></a>
<a href="https://www.privacyinternational.org/" target="_blank" title="Privacy International"><img src="/wp-content/images/logos/pi.png" alt="Privacy International"></a>
<a href="http://xnet-x.net/" target="_blank" title="X Net"><img src="/wp-content/images/logos/xnet.png" alt="X Net"></a>
<a href="http://accessnow.org/" target="_blank" title="Access Now"><img src="/wp-content/images/logos/access_now.png" alt="Access Now"></a>
</div>
<div class="license">
<a href="<?php echo pll__('https://creativecommons.org/licenses/by-sa/4.0/') ?>" >
<?php echo pll__('Content on this site is licensed under a Creative Commons Attribution 4.0 International license.')?>
</a>
</div>
</div>
<!-- .site-info -->
</footer><!-- #colophon -->
</div><!-- #page -->
......
......@@ -195,6 +195,11 @@ pll_register_string('question-button', 'Send', $group, $multiline); // register
pll_register_string('footer-coordinators', 'Campaign coordinators', $group, $multiline); // register footer texts
pll_register_string('footer-partners', 'Campaign partners', $group, $multiline); // register footer texts
pll_register_string('submission-confirmation', 'Thank you for your question, we will try and answer it and post on this website.', $group, $multiline); // register submission confirmation texts
pll_register_string('panoptykon-logo', 'panoptykon_en', $group, $multiline); // register panoptykon logo image title
pll_register_string('panoptykon-link', 'https://panoptykon.org/', $group, $multiline); // register panoptykon url
pll_register_string('panoptykon-title', 'Panoptykon Foundation', $group, $multiline); // register panoptykon link title
pll_register_string('cc-text', 'Content on this site is licensed under a Creative Commons Attribution 4.0 International license.', $group, $multiline); // register license text
pll_register_string('cc-link', 'https://creativecommons.org/licenses/by-sa/4.0/', $group, $multiline); // register license text
......
......@@ -270,7 +270,7 @@ input[type="submit"].usp-submit:hover {
display: flex;
flex-direction: column;
justify-content: space-between;
margin-bottom: 20px;
margin-bottom: 50px;
align-items: baseline;
}
......@@ -289,6 +289,17 @@ input[type="submit"].usp-submit:hover {
order: 1;
}
.site-footer .license {
margin: 60px auto 0;
}
.site-footer .license a {
color: #333;
font-family: "Lato", Helvetica, sans-serif;
font-weight: 1em;
font-weight: normal;
text-transform: none;
}
/* Everything but mobile */
@media screen and (min-width: 480px) {
......@@ -312,7 +323,6 @@ input[type="submit"].usp-submit:hover {
padding-bottom: 45px;
}
.site-search {
padding: 30px 0;
}
......@@ -366,6 +376,9 @@ input[type="submit"].usp-submit:hover {
max-width: 27%;
}
.site-footer .site-info .partners a {
max-width: 24%;
}
.site-header {
height: 320px;
......@@ -401,7 +414,6 @@ input[type="submit"].usp-submit:hover {
input[type="submit"].usp-submit {
font-size: 16pt;
}
}
/* Large screens */
......
......@@ -31,7 +31,7 @@ $header = get_header_image();
pll_the_languages(array('dropdown' => 1));
?>
<div class="site-branding">
<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><img src="/wp-content/images/logos/GDPR.png" title="GDPR" /></a></h1>
<h1 class="site-title"><a href="<?php echo esc_url( pll_home_url( '/' ) ); ?>" rel="home"><img src="/wp-content/images/logos/GDPR.png" title="GDPR" /></a></h1>
</div>
</header><!-- #masthead -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment