Index, gruntfile, package

This commit is contained in:
Antoine Boulanger
2014-09-29 17:43:35 -04:00
parent 7435c46bdc
commit 426edf5456
4 changed files with 55 additions and 71 deletions

View File

@@ -11,30 +11,30 @@ module.exports = function(grunt) {
watch: {
css: {
files: ['assets/styles/src/**/*.scss'],
tasks: ['sass', 'autoprefixer', 'notify:watch', 'notify_hooks'],
tasks: ['sass', 'autoprefixer', 'notify:watch'],
options: {
spawn: false,
livereload: true
}
}
},
sass: {
dist: {
files: {
'assets/styles/project-x.css': 'assets/styles/src/project-x.scss'
'assets/styles/dist/main.css': 'assets/styles/src/main.scss',
'assets/styles/dist/main.ie8.css': 'assets/styles/src/main.ie8.scss'
}
}
},
autoprefixer: {
build: {
options: {
browsers: ['last 2 versions', '> 1%', 'ie 8', 'ie 9']
browsers: ['last 2 versions', '> 1%', 'ie >= 8']
},
files: [
{
src : ['assets/styles/*.css'],
dest : 'assets/styles/',
src : ['assets/styles/dist/*.css'],
dest : 'assets/styles/dist/',
expand : true,
flatten: true
}
@@ -42,46 +42,50 @@ module.exports = function(grunt) {
}
},
notify: {
task_name: {
options: {
// Task-specific options go here.
}
},
watch: {
options: {
title: 'Sass', // optional
message: 'SASS compiled', //required
title: 'SASS',
message: 'SASS compiled',
}
}
},
notify_hooks: {
options: {
enabled: true,
title: "Project-x" // defaults to the name in package.json, or will use project directory's name
}
},
concat: {
jsbasic: {
src: 'assets/scripts/src/*.js',
dest: 'assets/scripts/main.js'
}
global: {
src: [
'assets/scripts/src/global.js'
,'assets/scripts/src/vendor/jquery-1.11.1.min.js'
],
dest: 'assets/scripts/dist/main.js',
}/*,
home: {
src: [
'assets/scripts/src/vendor/carousel.js'
,'assets/scripts/src/templates/home.js'
,'assets/scripts/src/objects/video.js'
],
dest: 'assets/scripts/dist/home.js',
}*/
},
uglify: {
my_target: {
files: {
'assets/scripts/main.js': ['assets/scripts/main.js']
'assets/scripts/dist/': ['assets/scripts/dist/*.js']
}
}
},
imagemin: { // Task
dynamic: {
files: [{
expand: true,
cwd: 'assets/images/',
src: ['*.{png,jpg,gif}'],
dest: 'assets/images/'
}]
}
}
});
// Configure automatic messaging
// grunt.task.run('notify_hooks');
// Integrate jQuery specific tasks
// grunt.loadTasks('tasks');
grunt.registerTask('default', ['watch']);
grunt.registerTask('build', ['responsive_images']);
grunt.registerTask('build', ['uglify']);
};

File diff suppressed because one or more lines are too long

View File

@@ -1,39 +1,19 @@
<!doctype html>
<html class="no-js" lang="">
<html lang="">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Project-x</title>
<!-- Place favicon.ico and apple-touch-icon(s) in the root directory -->
<link rel="stylesheet" href="css/normalize.css">
<link rel="stylesheet" href="css/main.css">
<script src="js/vendor/modernizr-2.8.3.min.js"></script>
<link rel="stylesheet" href="assets/styles/dist/main.css">
</head>
<body>
<!--[if lt IE 8]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
<!-- Add your site or application content here -->
<p>Hello world! This is HTML5 Boilerplate.</p>
<script src="//ajax.googleapis.com/ajax/libs/jquery/{{JQUERY_VERSION}}/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="js/vendor/jquery-{{JQUERY_VERSION}}.min.js"><\/script>')</script>
<script src="js/plugins.js"></script>
<script src="js/main.js"></script>
<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
<script>
(function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
e=o.createElement(i);r=o.getElementsByTagName(i)[0];
e.src='//www.google-analytics.com/analytics.js';
r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
ga('create','UA-XXXXX-X','auto');ga('send','pageview');
</script>
<script src="assets/scripts/dist/main.js"></script>
</body>
</html>

View File

@@ -1,25 +1,21 @@
{
"title": "Projet-x",
"name": "corim",
"name": "projet-x",
"version": "1.0.0",
"author": "Locomotive <info@locomotive.ca>",
"contributors": [
"Stephen Bégay <stephen@locomotive.ca>",
"Antoine Boulané <antoine@locomotive.ca>"
"Antoine Boulanger <antoine@locomotive.ca>"
],
"description": "Web site for <projet-x> by Locomotive.",
"license": "© 2014 — Locomotive, Projet-x",
"homepage": "projet-x.com",
"private": true,
"devDependencies": {
"grunt": "^0.4.5",
"load-grunt-tasks": "^0.4.0",
"grunt-sass": "^0.14.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-notify": "^0.3.0",
"grunt-autoprefixer": "^0.8.1",
"grunt-contrib-uglify": "^0.5.0",
"grunt-contrib-concat": "^0.4.0",
"grunt-contrib-imagemin": "^0.7.1"
"grunt": "0.4.5",
"load-grunt-tasks": "0.6.0",
"grunt-contrib-watch": "0.6.1",
"grunt-contrib-sass": "0.8.1",
"grunt-sass": "0.14.2",
"grunt-notify": "0.3.1",
"grunt-autoprefixer": "1.0.1",
"grunt-contrib-concat": "0.5.0",
"grunt-contrib-uglify": "0.6.0",
"grunt-contrib-imagemin": "0.8.1"
}
}