Fix main viewport

master
Marko Semet 2019-06-17 10:12:12 +02:00
parent 42372f5598
commit d469ce74cc
2 changed files with 17 additions and 8 deletions

View File

@ -3,8 +3,13 @@ html, body {
margin: 0; margin: 0;
padding: 0; padding: 0;
border: 0; border: 0;
}
html {
height: 100%; height: 100%;
} }
body {
min-height: 100%;
}
body { body {
display: grid; display: grid;
@ -19,13 +24,14 @@ body > * {
overflow: hidden; overflow: hidden;
} }
.main2 { .main2 {
height: calc(100%); height: 100%;
min-height: 100%;
margin: -1em; margin: -1em;
} }
.main3 { .main3 {
padding: 1em 0; padding: 1em 0;
margin: 0 1em; margin: 0 1em;
height: calc(100%); min-height: 100%;
} }
/* header */ /* header */
@ -44,13 +50,14 @@ header nav li {
} }
header nav > ul { header nav > ul {
padding-top: 0.25em; padding-top: 0.25em;
margin-left: -0.5em;
} }
header nav > ul > li { header nav > ul > li {
float: left; float: left;
margin-left: 0.5em; margin-left: 0.5em;
} }
header nav > ul > li:first-child { header nav > ul > li.page {
margin-left: 0; float: right;
} }
header nav > ul > li > div { header nav > ul > li > div {
margin-bottom: 0.25em; margin-bottom: 0.25em;

View File

@ -37,19 +37,21 @@
<h1><a href="{{ SITEURL }}/">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1> <h1><a href="{{ SITEURL }}/">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
<nav> <nav>
<ul> <ul>
{% for title, link in MENUITEMS %} {% for title, link in (MENUITEMS if MENUITEMS else [])[::-1] %}
<li> <li>
<a href="{{ link }}">{{ title }}</a> <div>
<a href="{{ link }}">{{ title }}</a>
</div>
</li> </li>
{% endfor %} {% endfor %}
{% if DISPLAY_PAGES_ON_MENU %} {% if DISPLAY_PAGES_ON_MENU %}
{% for p in pages %} {% for p in pages %}
<li{% if p == page %} class="active"{% endif %}> <li class="page {% if p == page %} active{% endif %}">
<div> <div>
<a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a> <a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a>
</div> </div>
</li>{% endfor %}{% endif %}{% if DISPLAY_CATEGORIES_ON_MENU %}{% for cat, null in categories %} </li>{% endfor %}{% endif %}{% if DISPLAY_CATEGORIES_ON_MENU %}{% for cat, null in categories %}
<li{% if cat == category %} class="active"{% endif %}> <li class="category {% if cat == category %} active{% endif %}">
<div> <div>
<a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a> <a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a>
</div> </div>