From 13130a217c416293a075ab73e3107ac15761c0e5 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Fri, 10 Jul 2020 20:23:19 +0100
Subject: [PATCH] Use FontAwesome for navbar icons

---
 app/public/static/notification.svg       | 93 ------------------------
 app/public/static/notification_alert.svg | 93 ------------------------
 app/templates/base.html                  |  6 +-
 3 files changed, 4 insertions(+), 188 deletions(-)
 delete mode 100644 app/public/static/notification.svg
 delete mode 100644 app/public/static/notification_alert.svg

diff --git a/app/public/static/notification.svg b/app/public/static/notification.svg
deleted file mode 100644
index edd648e8..00000000
--- a/app/public/static/notification.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="31.412476mm"
-   height="28.42704mm"
-   viewBox="0 0 31.412476 28.42704"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.2 2405546, 2018-03-11"
-   sodipodi:docname="notification.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="47.783055"
-     inkscape:cy="53.095002"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g821"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1877"
-     inkscape:window-height="1080"
-     inkscape:window-x="43"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-global="false">
-    <sodipodi:guide
-       position="15.708731,30.13464"
-       orientation="1,0"
-       id="guide823"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="13.971479,23.252449"
-       orientation="0,1"
-       id="guide825"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-10.149596,-260.42124)">
-    <g
-       id="g821"
-       transform="translate(4.6772167)">
-      <path
-         style="fill:#cccccc;stroke:none;stroke-width:0.22791502px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 34.706713,281.95262 c 0,0 0.05088,-0.47786 -0.454138,-0.79248 -0.598885,-0.37309 -1.792456,-0.65695 -2.135937,-1.62493 -0.633129,-1.78428 -1.208702,-12.36663 -3.568549,-14.5538 -2.359846,-2.18717 -7.194655,-4.17785 -7.194655,-4.17785 h -0.345341 c 0,0 -4.834807,1.99068 -7.194655,4.17785 -2.359846,2.18717 -2.935418,12.76952 -3.568547,14.5538 -0.3187212,0.89821 -1.5484903,1.15935 -2.1196334,1.54022 -0.5634184,0.37571 -0.4704434,0.87719 -0.4704434,0.87719 z"
-         id="path817"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csssccssscc" />
-      <path
-         style="fill:#cccccc;fill-rule:evenodd;stroke:none;stroke-width:0.32969889"
-         id="path841"
-         sodipodi:type="arc"
-         sodipodi:cx="21.295879"
-         sodipodi:cy="283.65527"
-         sodipodi:rx="4.158649"
-         sodipodi:ry="5.2277269"
-         sodipodi:start="0"
-         sodipodi:end="3.1415927"
-         d="m 25.454528,283.65527 a 4.158649,5.2277269 0 0 1 -2.079324,4.52735 4.158649,5.2277269 0 0 1 -4.158649,0 4.158649,5.2277269 0 0 1 -2.079325,-4.52735 l 4.158649,0 z" />
-    </g>
-  </g>
-</svg>
diff --git a/app/public/static/notification_alert.svg b/app/public/static/notification_alert.svg
deleted file mode 100644
index f2c3bb54..00000000
--- a/app/public/static/notification_alert.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="31.412476mm"
-   height="28.42704mm"
-   viewBox="0 0 31.412476 28.42704"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.2 2405546, 2018-03-11"
-   sodipodi:docname="notification_alert.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="47.783055"
-     inkscape:cy="63.196527"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g821"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1877"
-     inkscape:window-height="1080"
-     inkscape:window-x="43"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-global="false">
-    <sodipodi:guide
-       position="15.708731,30.13464"
-       orientation="1,0"
-       id="guide823"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="13.971479,23.252449"
-       orientation="0,1"
-       id="guide825"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-10.149596,-260.42124)">
-    <g
-       id="g821"
-       transform="translate(4.6772167)">
-      <path
-         style="fill:#ffff00;stroke:none;stroke-width:0.22791502px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 34.706713,281.95262 c 0,0 0.05088,-0.47786 -0.454138,-0.79248 -0.598885,-0.37309 -1.792456,-0.65695 -2.135937,-1.62493 -0.633129,-1.78428 -1.208702,-12.36663 -3.568549,-14.5538 -2.359846,-2.18717 -7.194655,-4.17785 -7.194655,-4.17785 h -0.345341 c 0,0 -4.834807,1.99068 -7.194655,4.17785 -2.359846,2.18717 -2.935418,12.76952 -3.568547,14.5538 -0.3187212,0.89821 -1.5484903,1.15935 -2.1196334,1.54022 -0.5634184,0.37571 -0.4704434,0.87719 -0.4704434,0.87719 z"
-         id="path817"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csssccssscc" />
-      <path
-         style="fill:#ffff00;fill-rule:evenodd;stroke:none;stroke-width:0.32969889"
-         id="path841"
-         sodipodi:type="arc"
-         sodipodi:cx="21.295879"
-         sodipodi:cy="283.65527"
-         sodipodi:rx="4.158649"
-         sodipodi:ry="5.2277269"
-         sodipodi:start="0"
-         sodipodi:end="3.1415927"
-         d="m 25.454528,283.65527 a 4.158649,5.2277269 0 0 1 -2.079324,4.52735 4.158649,5.2277269 0 0 1 -4.158649,0 4.158649,5.2277269 0 0 1 -2.079325,-4.52735 l 4.158649,0 z" />
-    </g>
-  </g>
-</svg>
diff --git a/app/templates/base.html b/app/templates/base.html
index ff2b0fb3..f3877b78 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -61,9 +61,11 @@
 				<ul class="navbar-nav ml-auto">
 					{% if current_user.is_authenticated %}
 						<li class="nav-item"><a class="nav-link" href="{{ url_for('notifications.list_all') }}">
-							<img src="/static/notification{% if current_user.notifications %}_alert{% endif %}.svg" />
+							<i class="fas fa-bell" {% if current_user.notifications %} style="color: yellow;"{% endif %}></i>
+						</a></li>
+						<li class="nav-item"><a class="nav-link" href="{{ url_for('packages.create_edit') }}">
+							<i class="fas fa-plus"></i>
 						</a></li>
-						<li class="nav-item"><a class="nav-link" href="{{ url_for('packages.create_edit') }}">+</a></li>
 						<li class="nav-item dropdown">
 							<a class="nav-link dropdown-toggle"
 								data-toggle="dropdown"