Skip to content

Commit 1ebf75f

Browse files
committed
Merge branch 'develop'
2 parents fd7fb80 + d7074e4 commit 1ebf75f

45 files changed

Lines changed: 104956 additions & 5 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
.tmp
12
.publish
23
.deploy
3-
/public
4+
node_modules
5+
bower_components
46

5-
.tmp
67
*~
78
*#
89
.DS_STORE
@@ -12,8 +13,6 @@ nbproject
1213
.idea
1314
.node_history
1415

15-
node_modules
16-
bower_components
1716

1817
lib-cov
1918
*.seed

build/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var path = require('path');
33
module.exports = {
44
rootDir: "../", // Root dir
55
srcDir: path.resolve("../src"), // Source files
6-
destDir: path.resolve("../public"), // Build destination
6+
destDir: path.resolve("../dist"), // Build destination
77
bowerDir: "../bower_components", // Bower dir
88
npmDir: "../node_modules", // Npm dir
99
port: 4000

dist/assets/demo.png

127 KB
Loading

dist/assets/faces/3.jpg

3.76 KB
Loading

dist/assets/faces/4.jpg

5.07 KB
Loading

dist/assets/faces/5.jpg

5.04 KB
Loading

dist/assets/faces/7.jpg

3.14 KB
Loading

dist/assets/faces/8.jpg

3.54 KB
Loading

dist/assets/fontawesome-webfont.svg

Lines changed: 565 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)