From 923108162444580bbaf94de0784ee574e37f6d96 Mon Sep 17 00:00:00 2001
From: NGPixel <github@ngpixel.com>
Date: Sat, 8 Jul 2017 21:01:07 -0400
Subject: [PATCH] fix: mongoose connect fix + allpages nav theming

---
 client/scss/components/collapsable-nav.scss |  13 +++++++++++++
 package.json                                |   2 +-
 server/libs/db.js                           |   2 +-
 yarn.lock                                   | Bin 247271 -> 247656 bytes
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/client/scss/components/collapsable-nav.scss b/client/scss/components/collapsable-nav.scss
index 0629776d..f190b0a2 100644
--- a/client/scss/components/collapsable-nav.scss
+++ b/client/scss/components/collapsable-nav.scss
@@ -107,3 +107,16 @@ .collapsable-nav {
   }
 
 }
+
+/* THEME OVERRIDE - START */
+
+@each $color, $colorvalue in $material-colors {
+  .is-primary-#{$color} .collapsable-nav {
+    &.has-children {
+      background-color: mc($color, '500');
+      border-left-color: mc($color, '700');
+    }
+  }
+}
+
+/* THEME OVERRIDE - END */
diff --git a/package.json b/package.json
index fb3a8372..619731d9 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "moment": "~2.18.1",
     "moment-timezone": "~0.5.13",
     "mongodb": "~2.2.30",
-    "mongoose": "4.10.8",
+    "mongoose": "^4.11.1",
     "multer": "~1.3.0",
     "node-2fa": "~1.1.2",
     "node-graceful": "~0.2.3",
diff --git a/server/libs/db.js b/server/libs/db.js
index 9169b06a..733d28a2 100644
--- a/server/libs/db.js
+++ b/server/libs/db.js
@@ -55,7 +55,7 @@ module.exports = {
 
     // Connect
 
-    self.onReady = modb.connect(appconfig.db)
+    self.onReady = modb.connect(appconfig.db, { useMongoClient: true })
 
     return self
   }
diff --git a/yarn.lock b/yarn.lock
index 7a7dff73e815fed48c2c5f95cf48a89674248c46..cab63c12dbd64b0df543807f0ad9ba3669c6fe4a 100644
GIT binary patch
delta 127
zcmaFf&Htj0zoCV33zJy<cJ+9s7Dl<e^!)tdREIbdJwro1Ln|%?g|gJ5;>`R!1tp-+
z^upOpdec+mnZ)&hvU(-yRmw)DW(G-SDHfKg<|Zad2BsFK<|zh7Cdr9O7D>j2W(H<v
d=7wge#*-O?#Hah$Gqbm!jAz<@GM-s34FJMdCBgsz

delta 47
zcmaFS$N#*WzoCV33zJy9ppHUreqMThesQXUiJqZ>p2c>tc%~M{cAX@q?K(-!HmLxN
Cgbx=0