master #5

Closed
boots wants to merge 6 commits from master into finndersbranch
4 changed files with 26 additions and 3 deletions
Showing only changes of commit a92ee83b87 - Show all commits

View File

@ -1,4 +1,6 @@
$sidebar_width: 20%;
$sidebar_background: rgba(255, 0, 0, .1);
$body_background: rgba(0, 255, 0, .1);
body {
margin: 0;
@ -6,8 +8,9 @@ body {
height: 100%;
position: fixed;
width: $sidebar_width;
background: rgba(255, 0, 0, .1);
background: $sidebar_background;
padding-top: 32px;
padding-bottom: 16px;
img {
width: 100%;
}
@ -17,8 +20,9 @@ body {
}
main {
height: 100%;
box-sizing: border-box;
margin-left: $sidebar_width;
background: rgba(0, 255, 0, .1);
background: $body_background;
padding-top: 50px;
article {
margin: auto;
@ -28,3 +32,7 @@ body {
}
}
}
@media screen and (max-width: 1000px) {
@import "mobile.scss";
}

11
sass/mobile.scss Normal file
View File

@ -0,0 +1,11 @@
body {
nav {
position: unset;
height: auto;
width: 100%;
}
main {
margin-left: 0;
height: auto;
}
}

4
templates/404.html Normal file
View File

@ -0,0 +1,4 @@
{% extends "base.html" %}
{% block content %}
<h1><em>Insert epic 404 page here</em></h1>
{% endblock %}

View File

@ -1,6 +1,6 @@
<nav>
<div>
<img src="{{ get_url(path='logo.png') }}">
<a href="/"><img src="{{ get_url(path='logo.png') }}"></a>
</div>
<div>
<ul>