From 3df7ee6d4fd5f0695dd901511365085dcb1daf24 Mon Sep 17 00:00:00 2001 From: Sunpy Date: Thu, 25 Apr 2019 18:07:46 +0100 Subject: [PATCH] Font -> Poppins --- static/css/custom.css | 1 + static/img/logo.svg | 6 +++ templates/layout/dash.html | 1 + templates/layout/includes/side_nav.html | 50 ++++++++++++++----------- 4 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 static/img/logo.svg diff --git a/static/css/custom.css b/static/css/custom.css index 0a66e08..0d3933d 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -1,3 +1,4 @@ body { background-color: #eee; + font-family: "Poppins", sans-serif; } \ No newline at end of file diff --git a/static/img/logo.svg b/static/img/logo.svg new file mode 100644 index 0000000..d6904e4 --- /dev/null +++ b/static/img/logo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/templates/layout/dash.html b/templates/layout/dash.html index fceafa4..9be7edc 100644 --- a/templates/layout/dash.html +++ b/templates/layout/dash.html @@ -2,6 +2,7 @@ {% include 'layout/includes/boot-head.html' %} + {% if title %} Husstanden - {{ title }} diff --git a/templates/layout/includes/side_nav.html b/templates/layout/includes/side_nav.html index d835225..bfcbf65 100644 --- a/templates/layout/includes/side_nav.html +++ b/templates/layout/includes/side_nav.html @@ -12,7 +12,7 @@ height: 100%; } -#sidenav ul > li { +#sidenav div { display: flex; flex-direction: column; } @@ -21,51 +21,57 @@ color: white; } -.navlist ul > li, .navlist ul > li > a { +.navlist div, .navlist div > a { display: flex; flex-grow: 1; } -.navlist ul > li > a > span { +.navlist div > a > span { flex-grow: 1; } -.navlist ul > li > a > i:last-child { +.navlist div > a > i:last-child { justify-content: flex-end; } +.navlist div > a > * { + margin-left: 10px; + margin-right: 10px; +} + .hidden { - display: none; + display: none !important; } -
+
+
- +
+
- -
  • +
    • +

    Title card

    - -
  • +
    • +
    Bills @@ -80,8 +86,8 @@
    - -
  • + +
    Recieps @@ -96,8 +102,8 @@
    • - - + + \ No newline at end of file