Fix #1 : Better CSS

This commit is contained in:
Alexis Hassler
2019-05-04 18:37:29 +02:00
parent 460d7e3ef4
commit be7a29f8ae
17 changed files with 310 additions and 669 deletions

View File

@@ -1,12 +1,11 @@
<div class="visualClear"></div>
<div class="site-footer" id="footer">
<div id="f-poweredbyico">
<a href="https://creativecommons.org/licenses/by-nc-sa/2.5/">
<img src="https://creativecommons.org/images/public/somerights20.png" alt="Paternit<69>-NonCommercial-ShareAlike 2.5" width="88" height="31">
</a>
<footer>
<div id="footer-left">
</div>
<ul id="f-list">
<li>{% if page.modified %}{{ site.data.i18n[site.lang].label.modified }}: {{ page.modified }}{% endif %}<br/></li>
<li>{% if page.created %}{{ site.data.i18n[site.lang].label.created }}: {{ page.created }}{% endif %}</li>
</ul>
</div>
<div id="footer-center">
{{ site.data.i18n[site.lang].label.modified }}: {{ page.modified }}<br/>
{{ site.data.i18n[site.lang].label.created }}: {{ page.created }}
</div>
<div id="footer-right">
<a href="https://creativecommons.org/licenses/by-sa/4.0/"></a>
</div>
</footer>

View File

@@ -1,7 +1,7 @@
{% include /functions/wiki-pages.html %}
{% assign redirect = page.redirect | default: site.data.i18n[site.lang].home %}
{% for other_page in wiki_pages %}
{% if other_page.slug == redirect %}
{% assign redirect_page = other_page %}
{% endif %}
{% endfor %}
{%- include /functions/wiki-pages.html -%}
{%- assign redirect = page.redirect | liquify -%}
{%- for other_page in wiki_pages -%}
{%- if other_page.slug == redirect -%}
{%- assign redirect_page = other_page -%}
{%- endif -%}
{%- endfor -%}

View File

@@ -1,7 +1,7 @@
{% assign wiki_pages = '' | split: '' %}
{% for collection in site.collections %}
{% assign prefix = collection.label | slice: 0, 4 %}
{% if prefix == 'wiki' %}
{% assign wiki_pages = wiki_pages | concat: collection.docs %}
{% endif %}
{% endfor %}
{%- assign wiki_pages = '' | split: '' -%}
{%- for collection in site.collections -%}
{%- assign prefix = collection.label | slice: 0, 4 -%}
{%- if prefix == 'wiki' -%}
{%- assign wiki_pages = wiki_pages | concat: collection.docs -%}
{%- endif -%}
{%- endfor -%}

View File

@@ -1,10 +1,9 @@
<meta charset="UTF-8" />
<title>{{ page.title }}</title>
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" href="/css/main.css" />
{% if include.redirect_url %}
<link rel="canonical" href="{{ include.redirect_url }}">
<meta http-equiv="refresh" content="0; url={{ include.redirect_url }}" />
{% endif %}
<link rel="alternate" type="application/atom+xml" title="{{ site.title }} feed" href="/feed.xml" />
<meta charset="UTF-8" />
<title>{{ page.title }} - {{ site.title }}</title>
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" href="/css/main.css" />
{%- if include.redirect_url -%}
<link rel="canonical" href="{{ include.redirect_url }}">
<meta http-equiv="refresh" content="0; url={{ include.redirect_url }}" />
{%- endif -%}
<link rel="alternate" type="application/atom+xml" title="{{ site.title }} feed" href="/feed.xml" />

View File

@@ -1,12 +1,10 @@
{% if page.links != nil %}
<div class="generated-sidebar portlet" id="p-links">
{%- if page.links != nil -%}
<div id="links" class="portlet">
<h3>{{ site.data.i18n[site.lang].label.links }}</h3>
<div class="portlet-body">
<ul>
{% for link in page.links %}
<li><a href="{{link.url}}">{{link.text}}</a></li>
{% endfor %}
</ul>
</div>
<ul class="portlet-body">
{%- for link in page.links -%}
<li><a href="{{link.url}}">{{link.text}}</a></li>
{%- endfor -%}
</ul>
</div>
{% endif %}
{%- endif -%}

View File

@@ -1,3 +1,3 @@
<div class="portlet" id="p-logo" role="banner">
<div id="logo">
<a href="/{{ site.data.i18n[site.lang].home }}.html" style="background-image: url({{ site.data.i18n[site.lang].logo }});" title="{{ site.data.i18n[site.lang].label.main_page }}"></a>
</div>

View File

@@ -1,21 +1,20 @@
{% if page.tags.size > 0 %}
<div class="generated-sidebar portlet" id="p-navigation" role="navigation">
{%- if page.tags.size > 0 -%}
<div id="navigation" class="portlet">
<h3>{{ site.data.i18n[site.lang].label.tags }}</h3>
<div class="portlet-body">
<ul>
{% include /functions/wiki-pages.html %}
{% for tag in page.tags %}
{%- include /functions/wiki-pages.html -%}
{%- for tag in page.tags -%}
<li id="n-tag-{{ tag }}"><a href="/{{ site.data.i18n[site.lang].prefix.tag }}{{ tag }}.html">{{ tag }}</a></li>
<ul>
{% for other_page in wiki_pages %}
{% if other_page.tags contains tag and other_page.slug != page.slug %}
{%- for other_page in wiki_pages -%}
{%- if other_page.tags contains tag and other_page.slug != page.slug -%}
<li><a href="{{ other_page.url }}.html">{{ other_page.title }}</a></li>
{% endif %}
{% endfor %}
{%- endif -%}
{%- endfor -%}
</ul>
{% endfor %}
{%- endfor -%}
</ul>
</div>
</div>
{% endif %}
{%- endif -%}

View File

@@ -1,8 +1,7 @@
{% if page.toc == true %}
<div class="generated-sidebar portlet" id="p-toc" role="toc">
{%- if page.toc == true -%}
<div id="toc" class="portlet">
{{- content | toc_only | replace: "
", "" -}}
<h3>{{ site.data.i18n[site.lang].label.toc }}</h3>
<div class="portlet-body">
{{ content | toc_only }}
</div>
</div>
{% endif %}
{%- endif -%}

View File

@@ -1,14 +1,14 @@
{% if page.author %}
<div class="generated-sidebar portlet" id="p-author" role="author">
<h3>{{ site.data.i18n[site.lang].label.author }}</h3>
{%- if page.author -%}
<div id="author" class="portlet">
<div class="portlet-body">
{% assign author = site.data.users[page.author] %}
{%- assign author = site.data.users[page.author] -%}
<ul>
<li><a href="/{{ site.data.i18n[site.lang].prefix.user }}{{ page.author }}.html">{{ author.name }}</a></li>
<li><a href="/{{ site.data.i18n[site.lang].prefix.user }}{{ page.author }}">{{ author.name }}</a></li>
</ul>
{% if author.logo %}
{%- if author.logo -%}
<img src="/{{ author.logo }}" style="max-width: 100%;margin: 3px" />
{% endif %}
{%- endif -%}
</div>
<h3>{{ site.data.i18n[site.lang].label.author }}</h3>
</div>
{% endif %}
{%- endif -%}