diff --git a/Gruntfile.js b/Gruntfile.js index 6ddfbd2..39546ff 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -3,31 +3,54 @@ module.exports = function(grunt) { // Project configuration. grunt.initConfig({ pkg: grunt.file.readJSON('package.json'), - concat: { - jquery: { - files: { - 'dist/js/jquery.min.js': ['bower_components/jquery/dist/jquery.min.js'], - 'dist/js/jquery.js': ['bower_components/jquery/dist/jquery.js'] - } - }, - bootstrap: { - files: { - 'dist/js/bootstrap.min.js': ['bower_components/bootstrap/dist/js/bootstrap.min.js'], - 'dist/js/bootstrap.js': ['bower_components/bootstrap/dist/js/bootstrap.js'], - 'dist/css/bootstrap.min.css': ['bower_components/bootstrap/dist/css/bootstrap.min.css'], - 'dist/css/bootstrap.css': ['bower_components/bootstrap/dist/css/bootstrap.css'], - 'dist/fonts/glyphicons-halflings-regular.eot': ['bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot'], - 'dist/fonts/glyphicons-halflings-regular.svg': ['bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg'], - 'dist/fonts/glyphicons-halflings-regular.ttf': ['bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf'], - 'dist/fonts/glyphicons-halflings-regular.woff': ['bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff'], - } - }, - }, copy: { main: { - src: ['*.html', 'mail/**', 'js/*.js'], + src: ['*.html', 'mail/**', 'js/**', 'img/**'], dest: 'dist/', }, + jquery: { + files: [ + { + expand: true, + cwd: 'bower_components/jquery/dist/', + src: [ + 'jquery.min.js', + 'jquery.js', + ], + dest: 'dist/js/' + }, + ] + }, + bootstrap: { + files: [ + { + expand: true, + cwd: 'bower_components/bootstrap/dist/', + src: [ + 'js/bootstrap.js', + 'js/bootstrap.min.js', + 'css/bootstrap.css', + 'css/bootstrap.min.css' + ], + dest: 'dist/' + }, + ] + }, + glyphicons: { + files: [ + { + expand: true, + cwd: 'bower_components/bootstrap/', + src: [ + 'fonts/glyphicons-halflings-regular.eot', + 'fonts/glyphicons-halflings-regular.svg', + 'fonts/glyphicons-halflings-regular.ttf', + 'fonts/glyphicons-halflings-regular.woff', + ], + dest: 'dist/' + }, + ] + }, }, less: { development: { @@ -48,19 +71,9 @@ module.exports = function(grunt) { } } }, - imagemin: { - dynamic: { - files: [{ - expand: true, - cwd: 'img/', - src: ['**/*.{png,jpg,gif}'], - dest: 'dist/img/' - }] - } - }, watch: { scripts: { - files: ['js/*.js'], + files: ['js/**'], tasks: ['concat'], options: { spawn: false, @@ -84,15 +97,12 @@ module.exports = function(grunt) { }); // Load the plugins. - grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-less'); - grunt.loadNpmTasks('grunt-contrib-imagemin'); grunt.loadNpmTasks('grunt-contrib-watch'); // Default task(s). - grunt.registerTask('default', ['concat', 'copy', 'less', 'imagemin']); - grunt.registerTask('build-css', ['less']); - + grunt.registerTask('default', ['copy', 'less']); + grunt.registerTask('less-compile', ['less']); }; diff --git a/bower.json b/bower.json deleted file mode 100644 index c490af8..0000000 --- a/bower.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "startbootstrap-agency", - "version": "1.0.0", - "homepage": "https://github.com/IronSummitMedia/startbootstrap-agency", - "authors": [ - "David Miller " - ], - "description": "A one page HTML theme for agencies created by Start Bootstrap", - "main": "/", - "license": "Apache 2.0", - "ignore": [ - "**/.*", - "node_modules", - "test", - "tests" - ] -} diff --git a/dist/fonts/glyphicons-halflings-regular.eot b/dist/fonts/glyphicons-halflings-regular.eot index fa9f730..4a4ca86 100644 Binary files a/dist/fonts/glyphicons-halflings-regular.eot and b/dist/fonts/glyphicons-halflings-regular.eot differ diff --git a/dist/fonts/glyphicons-halflings-regular.ttf b/dist/fonts/glyphicons-halflings-regular.ttf index 084d5cc..67fa00b 100644 Binary files a/dist/fonts/glyphicons-halflings-regular.ttf and b/dist/fonts/glyphicons-halflings-regular.ttf differ diff --git a/dist/fonts/glyphicons-halflings-regular.woff b/dist/fonts/glyphicons-halflings-regular.woff index 5d56160..8c54182 100644 Binary files a/dist/fonts/glyphicons-halflings-regular.woff and b/dist/fonts/glyphicons-halflings-regular.woff differ diff --git a/dist/img/about/2.jpg b/dist/img/about/2.jpg index 25cc551..24b4e5b 100644 Binary files a/dist/img/about/2.jpg and b/dist/img/about/2.jpg differ diff --git a/dist/img/header-bg.jpg b/dist/img/header-bg.jpg index 44f2f07..eaf775e 100644 Binary files a/dist/img/header-bg.jpg and b/dist/img/header-bg.jpg differ diff --git a/dist/img/map-image.png b/dist/img/map-image.png index d10e2a1..a047a27 100644 Binary files a/dist/img/map-image.png and b/dist/img/map-image.png differ diff --git a/dist/img/portfolio/dreams-preview.png b/dist/img/portfolio/dreams-preview.png index da36a4c..e2773b2 100644 Binary files a/dist/img/portfolio/dreams-preview.png and b/dist/img/portfolio/dreams-preview.png differ diff --git a/dist/img/portfolio/dreams.png b/dist/img/portfolio/dreams.png index 94c24dc..1b925d8 100644 Binary files a/dist/img/portfolio/dreams.png and b/dist/img/portfolio/dreams.png differ diff --git a/dist/img/portfolio/escape-preview.png b/dist/img/portfolio/escape-preview.png index 1a90032..a2343b4 100644 Binary files a/dist/img/portfolio/escape-preview.png and b/dist/img/portfolio/escape-preview.png differ diff --git a/dist/img/portfolio/escape.png b/dist/img/portfolio/escape.png index a801791..d5fcee8 100644 Binary files a/dist/img/portfolio/escape.png and b/dist/img/portfolio/escape.png differ diff --git a/dist/img/portfolio/golden-preview.png b/dist/img/portfolio/golden-preview.png index fcdecbb..b8fe735 100644 Binary files a/dist/img/portfolio/golden-preview.png and b/dist/img/portfolio/golden-preview.png differ diff --git a/dist/img/portfolio/golden.png b/dist/img/portfolio/golden.png index 83c8bfd..9b971ae 100644 Binary files a/dist/img/portfolio/golden.png and b/dist/img/portfolio/golden.png differ diff --git a/dist/img/portfolio/roundicons-free.png b/dist/img/portfolio/roundicons-free.png index a6f7465..dec0278 100644 Binary files a/dist/img/portfolio/roundicons-free.png and b/dist/img/portfolio/roundicons-free.png differ diff --git a/dist/img/portfolio/roundicons.png b/dist/img/portfolio/roundicons.png index 19d9f3d..97c0e9a 100644 Binary files a/dist/img/portfolio/roundicons.png and b/dist/img/portfolio/roundicons.png differ diff --git a/dist/img/portfolio/startup-framework-preview.png b/dist/img/portfolio/startup-framework-preview.png index 73eb448..0b612f3 100644 Binary files a/dist/img/portfolio/startup-framework-preview.png and b/dist/img/portfolio/startup-framework-preview.png differ diff --git a/dist/img/portfolio/startup-framework.png b/dist/img/portfolio/startup-framework.png index c99fb5d..3516bbc 100644 Binary files a/dist/img/portfolio/startup-framework.png and b/dist/img/portfolio/startup-framework.png differ diff --git a/dist/img/portfolio/treehouse-preview.png b/dist/img/portfolio/treehouse-preview.png index e446d87..df04474 100644 Binary files a/dist/img/portfolio/treehouse-preview.png and b/dist/img/portfolio/treehouse-preview.png differ diff --git a/dist/img/portfolio/treehouse.png b/dist/img/portfolio/treehouse.png index 46dfced..a800611 100644 Binary files a/dist/img/portfolio/treehouse.png and b/dist/img/portfolio/treehouse.png differ diff --git a/dist/img/team/2.jpg b/dist/img/team/2.jpg index 3467e3d..49d1c70 100644 Binary files a/dist/img/team/2.jpg and b/dist/img/team/2.jpg differ diff --git a/dist/index.html b/dist/index.html index 2d7437e..7af51b2 100644 --- a/dist/index.html +++ b/dist/index.html @@ -647,12 +647,12 @@ - - + + - - + + diff --git a/dist/js/cbpAnimatedHeader.js b/dist/js/plugins/cbpAnimatedHeader.js similarity index 100% rename from dist/js/cbpAnimatedHeader.js rename to dist/js/plugins/cbpAnimatedHeader.js diff --git a/dist/js/classie.js b/dist/js/plugins/classie.js similarity index 100% rename from dist/js/classie.js rename to dist/js/plugins/classie.js diff --git a/dist/js/contact_me.js b/dist/js/plugins/contact_me.js similarity index 100% rename from dist/js/contact_me.js rename to dist/js/plugins/contact_me.js diff --git a/dist/js/jqBootstrapValidation.js b/dist/js/plugins/jqBootstrapValidation.js similarity index 100% rename from dist/js/jqBootstrapValidation.js rename to dist/js/plugins/jqBootstrapValidation.js diff --git a/index.html b/index.html index 2d7437e..7af51b2 100644 --- a/index.html +++ b/index.html @@ -647,12 +647,12 @@ - - + + - - + + diff --git a/js/cbpAnimatedHeader.js b/js/plugins/cbpAnimatedHeader.js similarity index 100% rename from js/cbpAnimatedHeader.js rename to js/plugins/cbpAnimatedHeader.js diff --git a/js/classie.js b/js/plugins/classie.js similarity index 100% rename from js/classie.js rename to js/plugins/classie.js diff --git a/js/contact_me.js b/js/plugins/contact_me.js similarity index 100% rename from js/contact_me.js rename to js/plugins/contact_me.js diff --git a/js/jqBootstrapValidation.js b/js/plugins/jqBootstrapValidation.js similarity index 100% rename from js/jqBootstrapValidation.js rename to js/plugins/jqBootstrapValidation.js diff --git a/package.json b/package.json index 848c70b..f36e1ca 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,7 @@ "devDependencies": { "grunt": "~0.4.5", "grunt-contrib-copy": "~0.5.0", - "grunt-contrib-concat": "~0.5.0", "grunt-contrib-less": "~0.11.4", - "grunt-contrib-imagemin": "~0.8.0", "grunt-contrib-watch": "~0.6.1" } }