Merge branch 'master' into 5151/gdpr_modal

This commit is contained in:
PCoder 2019-01-30 21:05:34 +01:00
commit 16b5f1e5a4
12 changed files with 131 additions and 9 deletions

View file

@ -31,7 +31,7 @@
</a>
</li>
<li>
<a href="https://blog.ungleich.ch/en-us/cms/blog/feed/">
<a href="https://ungleich.ch/en-us/cms/blog/feed/">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-rss fa-stack-1x fa-inverse"></i>

View file

@ -10,9 +10,8 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="https://www.ungleich.ch">
<img src="{% static "blog.ungleich.ch/img/logo_white.svg" %}" />
</a>
<a href="/" id="logoBlack" class="navbar-brand custom-black-logo"><img src="{% static "blog.ungleich.ch/img/logo_black.svg" %}"></a>
<a href="/" id="logoWhite" class="navbar-brand"><img src="{% static "blog.ungleich.ch/img/logo_white.svg" %}"></a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->

View file

@ -2,6 +2,11 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Affordable VM hosting in Glarus, Switzerland, operated by 100% hydropower. Devuan, debian, freebsd, ubuntu, centos. Our tech stack is fully open source.">
<meta name="author" content="ungleich glarus ag">
<title>
{% block title %}
{% page_attribute "page_title" %}