From 74234bb1fdeaa648e944250a1b41529b637f7f02 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Mon, 19 Jun 2017 08:02:24 +1200
Subject: [PATCH] Sidebar icons colourified

---
 package.json                      | 4 ++--
 src/index.html                    | 2 +-
 src/scss/components/_sidebar.scss | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 441869c0..8204e836 100755
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
 		"react-ga": "2.1.2"
 	},
 	"scripts": {
-		"dev": "NODE_ENV=development webpack && ./build.sh",
-		"prod": "NODE_ENV=production webpack && ./build.sh",
+		"dev": "./build.sh && NODE_ENV=development webpack --watch",
+		"prod": "./build.sh && NODE_ENV=development webpack && NODE_ENV=production webpack",
 		"release": "NODE_ENV=production webpack && NODE_ENV=development webpack && ./build.sh && python setup.py sdist upload -r pypi"
 	}
 }
diff --git a/src/index.html b/src/index.html
index 00efe270..17ccb80d 100755
--- a/src/index.html
+++ b/src/index.html
@@ -14,7 +14,7 @@
 	<link rel="shortcut icon" type="image/x-icon" href="/iris/assets/favicon.ico" />
 	<link rel="shortcut-icon" href="/iris/assets/favicon.ico" />
 
-	<link href="//fonts.googleapis.com/css?family=Archivo+Narrow:400,700|Lato:400,400i,700|Overpass:400,400i,600|Montserrat:400|500|600" rel="stylesheet">
+	<link href="//fonts.googleapis.com/css?family=Archivo+Narrow:400,700|Lato:400,400i,700|Overpass:400,400i,600|Montserrat:400|500|600|News+Cycle:400,700|PT+Sans+Narrow:400,700" rel="stylesheet">
 	<link href="/iris/app.css" rel="stylesheet" />
 
 	<link rel="manifest" href="/iris/assets/manifest.json">
diff --git a/src/scss/components/_sidebar.scss b/src/scss/components/_sidebar.scss
index 9cc5684e..56be17d7 100755
--- a/src/scss/components/_sidebar.scss
+++ b/src/scss/components/_sidebar.scss
@@ -89,6 +89,11 @@ aside{
 
 			&.active {
 				color: $turquoise;
+				opacity: 1 !important;
+
+				.icon {
+
+				}
 			}
 
 			&[disabled] {
@@ -97,7 +102,7 @@ aside{
 			}
 
 			&:hover:not([disabled]) {
-				color: $secondary_grey;
+				opacity: 0.75;
 			}
 		}