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 29eaa6e..927d84d 100644 --- a/lib/SnowLoader.php +++ b/lib/SnowLoader.php @@ -59,9 +59,10 @@ public function __construct( * Make it snow! */ protected function goSnow() { + // 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 7914271..af6a41c 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,12 @@ "description": "", "main": "index.js", "dependencies": { - "magic-snowflakes": "^1.0.0" + "magic-snowflakes": "2.1.0" }, "devDependencies": {}, + "author": "", "scripts": { - "build": "cp node_modules/magic-snowflakes/snowflakes.js js/vendor.js" + "build": "cp node_modules/magic-snowflakes/dist/snowflakes.min.js js/vendor.js" }, - "author": "", "license": "ISC" -} +} \ No newline at end of file