Skip to content

Commit

Permalink
Merge pull request #1 from CloudKidStudio/features-bootstrap
Browse files Browse the repository at this point in the history
Features bootstrap
  • Loading branch information
Matt Karl committed Nov 18, 2014
2 parents 16db5c7 + d7c85c5 commit 130d011
Show file tree
Hide file tree
Showing 17 changed files with 949 additions and 913 deletions.
7 changes: 6 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@
"dependencies": {
"pixi.js": "https://github.com/CloudKidStudio/pixi.js.git#^1.6.2",
"filesaver": "https://github.com/eligrey/FileSaver.js.git",
"bootstrap": "~3.2.0",
"bootstrap-touchspin": "~3.0.1",
"seiyria-bootstrap-slider": "~4.0.8",
"cloudkid-framework": "*",
"pixi-particles": "*",
"normalize.css": "*",
"node-webkit-app": "*"
"node-webkit-app": "*",
"jquery": "*",
"jquery-minicolors": "*"
}
}
27 changes: 23 additions & 4 deletions build.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,17 @@
"components/cloudkid-framework/dist/modules/tasks.min.js",
"components/cloudkid-framework/dist/modules/display-pixi.min.js",
"components/pixi-particles/dist/pixi-particles.min.js",
"components/filesaver/FileSaver.js"
"components/filesaver/FileSaver.js",
"components/jquery/dist/jquery.js",
"components/bootstrap/dist/js/bootstrap.min.js",
"components/bootstrap/less/bootstrap.less",
"components/bootstrap/less/theme.less",
"components/bootstrap-touchspin/dist/jquery.bootstrap-touchspin.min.js",
"components/bootstrap-touchspin/dist/jquery.bootstrap-touchspin.min.css",
"components/seiyria-bootstrap-slider/dist/css/bootstrap-slider.min.css",
"components/seiyria-bootstrap-slider/dist/bootstrap-slider.min.js",
"components/jquery-minicolors/jquery.minicolors.css",
"components/jquery-minicolors/jquery.minicolors.min.js"
],
"librariesDebug": [
"components/normalize.css/normalize.css",
Expand All @@ -32,7 +42,16 @@
"components/cloudkid-framework/dist/modules/tasks.js",
"components/cloudkid-framework/dist/modules/display-pixi.js",
"components/pixi-particles/dist/pixi-particles.js",
"components/filesaver/FileSaver.js"
"components/filesaver/FileSaver.js",
"components/jquery/dist/jquery.js",
"components/bootstrap/dist/js/bootstrap.js",
"components/bootstrap/less/bootstrap.less",
"components/bootstrap/less/theme.less",
"components/bootstrap-touchspin/dist/jquery.bootstrap-touchspin.js",
"components/bootstrap-touchspin/dist/jquery.bootstrap-touchspin.css",
"components/seiyria-bootstrap-slider/dist/css/bootstrap-slider.css",
"components/seiyria-bootstrap-slider/js/bootstrap-slider.js",
"components/jquery-minicolors/jquery.minicolors.css",
"components/jquery-minicolors/jquery.minicolors.js"
]
}

}
28 changes: 27 additions & 1 deletion deploy/assets/css/libraries.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion deploy/assets/css/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Loading

0 comments on commit 130d011

Please sign in to comment.