Skip to content

Commit

Permalink
updating the build dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
carlos-algms committed May 13, 2017
1 parent 485ac67 commit 2e60811
Show file tree
Hide file tree
Showing 40 changed files with 2,737 additions and 1,900 deletions.
21 changes: 11 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.DS_Store
Thumbs.db
db.json
*.log
node_modules/
public/
.deploy*/
.idea/
*.iml
.tmp/
.DS_Store
Thumbs.db
db.json
*.log
node_modules/
public/
.deploy*/
.idea/dataSources/
.idea/workspace.xml
.idea/tasks.xml
.tmp/
11 changes: 7 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
module.exports = function(grunt){
const loadGruntTasks = require('load-grunt-tasks');

module.exports = (grunt) => {
grunt.initConfig({
copy: {
fontawesome: {
Expand Down Expand Up @@ -85,7 +87,8 @@ module.exports = function(grunt){
findNestedDependencies: true,
paths: {
jquery: 'empty:',
lightbox: '../../node_modules/lightbox2/dist/js/lightbox' //lightbox need to be here, because it cant find images if placed on head
// lightbox need to be here, because it cant find images if placed on head
lightbox: '../../node_modules/lightbox2/dist/js/lightbox'
},
modules: [
{
Expand All @@ -100,9 +103,9 @@ module.exports = function(grunt){
}
});

require('load-grunt-tasks')(grunt);
loadGruntTasks(grunt);


grunt.registerTask('default', []);
grunt.registerTask('build', [ 'clean', 'copy', 'cssmin', 'requirejs', 'uglify', 'concat']);
grunt.registerTask('build', ['clean', 'copy', 'cssmin', 'requirejs', 'uglify', 'concat']);
};
9 changes: 9 additions & 0 deletions materialize.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
34 changes: 19 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
{
"name": "hexo-theme-materialize",
"version": "1.0.0",
"version": "1.1.0",
"private": true,
"scripts": {
"build": "grunt build"
},
"devDependencies": {
"font-awesome": "^4.5.0",
"grunt": "^0.4.5",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-concat": "^1.0.0",
"grunt-contrib-copy": "^0.8.2",
"grunt-contrib-cssmin": "^0.14.0",
"grunt-contrib-requirejs": "^0.4.4",
"grunt-contrib-uglify": "^0.11.1",
"jquery": "^2.2.1",
"jquery-circle-progress": "^1.1.3",
"lightbox2": "^2.8.2",
"load-grunt-tasks": "^3.4.0",
"materialize-css": "^0.97.5",
"requirejs": "^2.1.22"
"font-awesome": "^4.7.0",
"grunt": "^1.0.1",
"grunt-cli": "^1.2.0",
"grunt-contrib-clean": "^1.1.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^2.2.0",
"grunt-contrib-requirejs": "^1.0.0",
"grunt-contrib-uglify": "^3.0.0",
"jquery": "^3.2.1",
"jquery-circle-progress": "^1.2.2",
"lightbox2": "^2.9.0",
"load-grunt-tasks": "^3.5.2",
"materialize-css": "^0.98.2",
"requirejs": "^2.3.3"
}
}
13 changes: 7 additions & 6 deletions source/css/vendors.css

Large diffs are not rendered by default.

Loading

0 comments on commit 2e60811

Please sign in to comment.