Merge branch 'master' into hidden_robots

This commit is contained in:
olipratt 2017-03-02 20:18:58 +00:00
commit 0931d35525
4 changed files with 8 additions and 4 deletions

View file

@ -134,7 +134,7 @@ main {
} }
.pagination { .pagination {
margin: 4% 8% 2% 8%; margin: 4% 8% 4% 8%;
height: 20px; height: 20px;
} }
@ -290,6 +290,10 @@ a.btn:hover {
display: block; display: block;
} }
.float-left {
float: left;
}
.float-right { .float-right {
float: right; float: right;
} }

File diff suppressed because one or more lines are too long

View file

@ -1,7 +1,7 @@
{% if DEFAULT_PAGINATION %} {% if DEFAULT_PAGINATION %}
<div class="pagination"> <div class="pagination">
{% if articles_page.has_next() %} {% if articles_page.has_next() %}
<a class="btn" href="{{ SITEURL }}/{{ articles_next_page.url }}"> <a class="btn float-left" href="{{ SITEURL }}/{{ articles_next_page.url }}">
<i class="fa fa-angle-left"></i> {{ _('Older Posts') }} <i class="fa fa-angle-left"></i> {{ _('Older Posts') }}
</a> </a>
{% endif %} {% endif %}

View file

@ -11,5 +11,5 @@
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})(); })();
</script> </script>
<noscript><p><img src="//bnjbvr.alwaysdata.net/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <noscript><p><img src="//{{ PIWIK_URL }}/piwik.php?idsite={{ PIWIK_SITE_ID }}" style="border:0" alt="" /></p></noscript>
<!-- End Piwik Code --> <!-- End Piwik Code -->