aboutsummaryrefslogtreecommitdiff
path: root/shardweb/assets
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2018-10-12 16:47:54 +0200
committerAlex Auvolat <alex@adnab.me>2018-10-12 16:47:54 +0200
commit76749e8f64ce3caf7e0e5c17dfee373dcf4dfe6e (patch)
treecd7651cf771cc45315322096df576fddd8cb8950 /shardweb/assets
parentf5b4131160520a2540445619188c3c8e0f37da37 (diff)
downloadshard-76749e8f64ce3caf7e0e5c17dfee373dcf4dfe6e.tar.gz
shard-76749e8f64ce3caf7e0e5c17dfee373dcf4dfe6e.zip
tweaks
Diffstat (limited to 'shardweb/assets')
-rw-r--r--shardweb/assets/brunch-config.js17
-rw-r--r--shardweb/assets/package-lock.json5
-rw-r--r--shardweb/assets/package.json6
3 files changed, 17 insertions, 11 deletions
diff --git a/shardweb/assets/brunch-config.js b/shardweb/assets/brunch-config.js
index 9808ab0..28e4593 100644
--- a/shardweb/assets/brunch-config.js
+++ b/shardweb/assets/brunch-config.js
@@ -48,14 +48,15 @@ exports.config = {
// Do not use ES6 compiler in vendor code
ignore: [/vendor/]
},
- copycat: {
- "fonts": ["node_modules/startbootstrap-sb-admin/fonts"],
- "css": ["node_modules/startbootstrap-sb-admin/css"],
- "js": ["node_modules/startbootstrap-sb-admin/js"],
- "font-awesome": ["node_modules/startbootstrap-sb-admin/font-awesome"],
- verbose: true,
- onlyChanged: true
- }
+ copycat: {
+ "fonts": ["node_modules/startbootstrap-sb-admin/fonts",
+ "node_modules/font-awesome/fonts"],
+ "css": ["node_modules/startbootstrap-sb-admin/css",
+ "node_modules/font-awesome/css"],
+ "js": ["node_modules/startbootstrap-sb-admin/js"],
+ verbose: true,
+ onlyChanged: true
+ }
},
modules: {
diff --git a/shardweb/assets/package-lock.json b/shardweb/assets/package-lock.json
index f8e5231..3e06420 100644
--- a/shardweb/assets/package-lock.json
+++ b/shardweb/assets/package-lock.json
@@ -2803,6 +2803,11 @@
"resolve-dir": "^0.1.0"
}
},
+ "font-awesome": {
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
+ "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
+ },
"for-in": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
diff --git a/shardweb/assets/package.json b/shardweb/assets/package.json
index 797f7f7..5fedb68 100644
--- a/shardweb/assets/package.json
+++ b/shardweb/assets/package.json
@@ -6,16 +6,16 @@
"watch": "brunch watch --stdin"
},
"dependencies": {
- "copycat-brunch": "^1.1.0",
+ "font-awesome": "^4.7.0",
"phoenix": "file:../deps/phoenix",
"phoenix_html": "file:../deps/phoenix_html",
"startbootstrap-sb-admin": "3.3.7"
},
"devDependencies": {
+ "copycat-brunch": "^1.1.0",
"babel-brunch": "6.1.1",
"brunch": "^2.10.17",
"clean-css-brunch": "2.10.0",
- "uglify-js-brunch": "2.10.0",
- "copycat-brunch": "1.1.0"
+ "uglify-js-brunch": "2.10.0"
}
}