Merge remote-tracking branch 'origin/master' into dev

2017-10-15 17:13:35 -04:00
parent ca8451720f c2db365922
commit e183167c9b
53 changed files with 1142 additions and 125 deletions
--- a/client/scss/components/nav.scss
+++ b/client/scss/components/nav.scss
@@ -173,7 +173,11 @@
 		&.is-outlined {
 			background-color: mc($primary, '500');
 			color: mc($primary, '100');
-		}
+    }
+
+    &.is-icon-only i {
+      margin-right: 0;
+    }

 		&:hover {
 			background-color: mc($primary, '700');