madmaurice/test
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into 'feature-multilingual'

Browse source 
# Conflicts:
#   _includes/menu.html
This commit is contained in:
madmaurice 2018-01-01 01:29:35 +01:00
parent 030e1bce0e afc1a6ea80
commit d942b1393b
4 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.gitlab-ci.yml Normal file
View file

@ -0,0 +1,14 @@
stages:
- deploy
deploy-master:
stage: deploy
tags:
- website
only:
- master
script:
- jekyll build
- rsync --recursive _site/ /srv/deploy/

12
_includes/footer.html
View file

@ -5,7 +5,17 @@
<div class="whitebox footer">
<a href="#">Zom.bi</a>
/
Design by <a href="#">bsod</a>, <a href="#">Ranomier</a> and <a href="#">madmaurice</a>
Design by <a href="#">bsod</a>,
<a href="#">Ranomier</a> and
<a href="#">madmaurice</a>
/
<a rel="license"
href="http://creativecommons.org/licenses/by-nc-sa/3.0/de/">
Content and Design licensed under
<img alt="Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Germany License"
style="border-width:0"
src="https://i.creativecommons.org/l/by-nc-sa/3.0/de/80x15.png" />
</a>
</div>
</div>
</div>

6
_includes/header.html
View file

@ -9,13 +9,13 @@
<title>{{ page.title }} - Zom.bi</title>
<link rel="stylesheet" href="{{ "/assets/css/foundation.css" | relative_url }}">
<link rel="stylesheet" href="{{ "/assets/css/index.css" | relative_url }}">
<link rel="stylesheet" href="{{ "assets/css/foundation.css" | relative_url }}">
<link rel="stylesheet" href="{{ "assets/css/index.css" | relative_url }}">
</head>
<body>
<header class="header">
<a class="#header"><img src="{{ "/assets/images/logo-green.png" | relative_url }}" alt="Zom.bi"></a>
<a class="#header"><img src="{{ "assets/images/logo-green.png" | relative_url }}" alt="Zom.bi"></a>
<h2 class="tagline show-for-medium">The friendly neighborhood tech community</h2>
<ul class="header-subnav show-for-medium">
{% include menu.html %}

18
_includes/menu.html
View file

@ -1,11 +1,11 @@
{% for node in site.pages %}
{% if node.lang == page.lang %}
{% if node.url == page.url %}
<li><a href="{{ node.url }}" class="is-active">{{ node.menutitle }}</a></li>
{% else %}
<li><a href="{{ node.url }}">{{ node.menutitle }}</a></li>
{% endif %}
{% endif %}
{% endfor %}
{%- for node in site.pages -%}
{%- if node.lang == page.lang and node.menutitle -%}
{%- if node.url == page.url -%}
<li><a href="{{ node.url }}" class="is-active">{{ node.menutitle | escape }}</a></li>
{%- else -%}
<li><a href="{{ node.url }}">{{ node.menutitle | escape }}</a></li>
{%- endif -%}
{%- endif -%}
{%- endfor -%}
<li><a href="https://git.zom.bi/explore/projects">Git</a></li>
<li><a href="https://wiki.zom.bi/">Wiki</a></li>