Font -> Poppins

This commit is contained in:
Emily 2019-04-25 18:07:46 +01:00
parent 1510f0f334
commit 3df7ee6d4f
4 changed files with 36 additions and 22 deletions

View File

@ -1,3 +1,4 @@
body { body {
background-color: #eee; background-color: #eee;
font-family: "Poppins", sans-serif;
} }

6
static/img/logo.svg Normal file
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" height="230" width="300">
<path d="M150 0 L0 130 L55 130 L150 50 L240 130 L300 130 Z" fill="#fff"/>
<line x1="70" y1="92" x2="70" y2="250" style="stroke:#fff;stroke-width:45" />
<line x1="230" y1="30" x2="230" y2="250" style="stroke:#fff;stroke-width:45" />
<line x1="70" y1="150" x2="230" y2="150" style="stroke:#fff;stroke-width:45" />
</svg>

After

Width:  |  Height:  |  Size: 389 B

View File

@ -2,6 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
{% include 'layout/includes/boot-head.html' %} {% include 'layout/includes/boot-head.html' %}
<link href="https://fonts.googleapis.com/css?family=Poppins" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/custom.css') }}"> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/custom.css') }}">
{% if title %} {% if title %}
<title>Husstanden - {{ title }}</title> <title>Husstanden - {{ title }}</title>

View File

@ -12,7 +12,7 @@
height: 100%; height: 100%;
} }
#sidenav ul > li { #sidenav div {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
@ -21,51 +21,57 @@
color: white; color: white;
} }
.navlist ul > li, .navlist ul > li > a { .navlist div, .navlist div > a {
display: flex; display: flex;
flex-grow: 1; flex-grow: 1;
} }
.navlist ul > li > a > span { .navlist div > a > span {
flex-grow: 1; flex-grow: 1;
} }
.navlist ul > li > a > i:last-child { .navlist div > a > i:last-child {
justify-content: flex-end; justify-content: flex-end;
} }
.navlist div > a > * {
margin-left: 10px;
margin-right: 10px;
}
.hidden { .hidden {
display: none; display: none !important;
} }
</style> </style>
<div class="d-flex flex-row" id="sidenav"> <div class="d-flex flex-column" id="sidenav">
<div class="top"> <div class="top">
<!-- Here be logo area --> <!-- Here be logo area -->
<!-- <img alt="Logo" src="{{ url_for('static', filename='img/logo.svg') }}" height="40px"/> -->
</div> </div>
<div class="navlist"> <div class="navlist">
<!-- Here be dropdown menus --> <!-- Here be dropdown menus -->
<div class="p-2"> <!-- Padding --> <div class="p-2"> <!-- Padding -->
<ul> <div class="flex-column">
<li> <!-- Collection --> <div> <!-- Collection -->
<a href="#dash"> <a href="#dash">
<i class="fa fa-chart-bar"></i><span>Dashboard</span> <i class="fa fa-chart-bar"></i><span>Dashboard</span>
<i class="fas fa-chevron-right"></i> <i class="fas fa-chevron-right"></i>
</a> </a>
<div class="hidden"> <!-- Hidden until clicked #dash --> <div class="hidden"> <!-- Hidden until clicked #dash -->
<ul> <div class="flex-column">
<li> <div>
<a href="#dash-test">Test</a> <!-- TODO: Add dot prefix --> <a href="#dash-test">Test</a> <!-- TODO: Add dot prefix -->
</li> </div>
<li> <div>
<a href="#dash-demo">Demo</a> <a href="#dash-demo">Demo</a>
</li> </div>
</ul> </div>
</div> </div>
</li> </div>
<li> <div>
<h4>Title card</h4> <!-- TODO: Padding and such --> <h4>Title card</h4> <!-- TODO: Padding and such -->
</li> </div>
<li> <div>
<a href="#bills"> <a href="#bills">
<i class="fa fa-chart-bar"></i><span>Bills</span> <i class="fa fa-chart-bar"></i><span>Bills</span>
<i class="fas fa-chevron-right"></i> <i class="fas fa-chevron-right"></i>
@ -80,8 +86,8 @@
</li> </li>
</ul> </ul>
</div> </div>
</li> </div>
<li> <div>
<a href="#recieps"> <a href="#recieps">
<i class="fa fa-chart-bar"></i><span>Recieps</span> <i class="fa fa-chart-bar"></i><span>Recieps</span>
<i class="fas fa-chevron-right"></i> <i class="fas fa-chevron-right"></i>
@ -96,8 +102,8 @@
</li> </li>
</ul> </ul>
</div> </div>
</li> </div>
</ul> </div>
</div> </div>
</div> </div>
</div> </div>