From 7beaf6d374fa02c4e4b233b4178ee6e9481de021 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 17 Dec 2017 21:44:38 +0000
Subject: [PATCH 1/2] Add new snowflake engine, improve build script

---
 lib/SnowLoader.php | 2 +-
 package.json       | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/SnowLoader.php b/lib/SnowLoader.php
index 29eaa6e..daa999c 100644
--- a/lib/SnowLoader.php
+++ b/lib/SnowLoader.php
@@ -59,7 +59,7 @@ public function __construct(
 	 * Make it snow!
 	 */
 	protected function goSnow() {
-		Util::addScript('xmas', 'vendor');
+		Util::addScript('xmas', '../node_modules/magic-snowflakes/dist/snowflakes.min.js');
 		Util::addScript('xmas', 'snowflakes');
 		Util::addStyle('xmas', 'style');
 	}
diff --git a/package.json b/package.json
index 7914271..d3d95fc 100644
--- a/package.json
+++ b/package.json
@@ -4,12 +4,9 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
-    "magic-snowflakes": "^1.0.0"
+    "magic-snowflakes": "2.0.1"
   },
   "devDependencies": {},
-  "scripts": {
-    "build": "cp node_modules/magic-snowflakes/snowflakes.js js/vendor.js"
-  },
   "author": "",
   "license": "ISC"
 }

From 8b915619f393e30c75aa4f2cf5542e0d2ca1be1c Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 18 Dec 2017 15:35:31 +0000
Subject: [PATCH 2/2] Fix z index. Remove unnecessary css.

---
 Makefile           | 2 +-
 css/style.css      | 4 ----
 js/snowflakes.js   | 6 +++++-
 lib/SnowLoader.php | 7 ++++---
 package.json       | 7 +++++--
 5 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 css/style.css

diff --git a/Makefile b/Makefile
index 898a396..2ac209f 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ endif
 endif
 
 app_doc_files=README.md CHANGELOG.md
-app_src_dirs=js appinfo lib css
+app_src_dirs=js appinfo lib
 app_all_src=$(app_src_dirs) $(app_doc_files)
 build_dir=build
 dist_dir=$(build_dir)/dist
diff --git a/css/style.css b/css/style.css
deleted file mode 100644
index 59cb9ae..0000000
--- a/css/style.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.snowflake {
-	/* Make sure flakes show above files navbar, but under top navbar */
-	z-index: 51;
-}
\ No newline at end of file
diff --git a/js/snowflakes.js b/js/snowflakes.js
index d5da7d9..35f969c 100644
--- a/js/snowflakes.js
+++ b/js/snowflakes.js
@@ -1 +1,5 @@
-window.onload = Snowflakes;
\ No newline at end of file
+window.onload = function() {
+	var sf = new Snowflakes({
+		zIndex: 51 /* Just below the top nav bar */
+	});
+};
\ No newline at end of file
diff --git a/lib/SnowLoader.php b/lib/SnowLoader.php
index daa999c..927d84d 100644
--- a/lib/SnowLoader.php
+++ b/lib/SnowLoader.php
@@ -59,9 +59,10 @@ public function __construct(
 	 * Make it snow!
 	 */
 	protected function goSnow() {
-		Util::addScript('xmas', '../node_modules/magic-snowflakes/dist/snowflakes.min.js');
+		// Main snowflake engine
+		Util::addScript('xmas', 'vendor');
+		// Our implementation
 		Util::addScript('xmas', 'snowflakes');
-		Util::addStyle('xmas', 'style');
 	}
 
 	/**
@@ -90,4 +91,4 @@ private function isFilesApp() {
 			&& strpos($this->request->getRequestUri(), '/apps/files') !== false;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index d3d95fc..af6a41c 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,12 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
-    "magic-snowflakes": "2.0.1"
+    "magic-snowflakes": "2.1.0"
   },
   "devDependencies": {},
   "author": "",
+  "scripts": {
+    "build": "cp node_modules/magic-snowflakes/dist/snowflakes.min.js js/vendor.js"
+  },
   "license": "ISC"
-}
+}
\ No newline at end of file