Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new snowflake engine #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add new snowflake engine #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7beaf6d
Add new snowflake engine, improve build script
tomneedham Dec 17, 2017
8b91561
Fix z index. Remove unnecessary css.
tomneedham Dec 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions css/style.css
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion js/snowflakes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
window.onload = Snowflakes;
window.onload = function() {
var sf = new Snowflakes({
zIndex: 51 /* Just below the top nav bar */
});
};
5 changes: 3 additions & 2 deletions lib/SnowLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}

/**
Expand Down Expand Up @@ -90,4 +91,4 @@ private function isFilesApp() {
&& strpos($this->request->getRequestUri(), '/apps/files') !== false;
}

}
}
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}