Merge branch 'develop' into NodeGuy/#304

luniehq · Apr 5, 2018 · e0eecac · e0eecac
2 parents a528e2c + a5c3a41
commit e0eecac
Show file tree

Hide file tree

Showing 64 changed files with 601 additions and 340 deletions.
diff --git a/app/src/renderer/App.vue b/app/src/renderer/App.vue
@@ -30,8 +30,16 @@ export default {
     Notifications,
     Session
   },
-  computed: { ...mapGetters(["notifications", "config"]) },
-  store
+  computed: { ...mapGetters(["notifications", "config", "themes"]) },
+  mounted() {
+    this.$store.commit("updateTheme", this.themes.active)
+  },
+  store,
+  watch: {
+    "themes.active"(newTheme) {
+      this.$store.commit("updateTheme", this.themes.active)
+    }
+  }
 }
 </script>
 

diff --git a/app/src/renderer/assets/images/cosmos-wordmark-black.svg b/app/src/renderer/assets/images/cosmos-wordmark-black.svg