Grunt update

This commit is contained in:
Antoine Boulanger
2014-11-10 13:57:14 -05:00
parent c28b8d6f07
commit e9e261221c
4 changed files with 18 additions and 15 deletions

View File

@@ -188,26 +188,26 @@ module.exports = function(grunt) {
grunt.loadNpmTasks("grunt-markdown-pdf");
grunt.registerTask('default', [
'concat',
'watch'
]);
grunt.registerTask('wlint', [
// Javasript
'jshint',
'jsonlint',
'concat',
'uglify',
// PHP
'phplint',
// CSS
'csscomb',
'sass',
'autoprefixer',
// Utilities
'watch'
]);
grunt.registerTask('build', [
'sass',
'autoprefixer',
'concat',
'uglify',
'uglify',
'imagemin'
]);
grunt.registerTask('c', [
@@ -216,5 +216,4 @@ module.exports = function(grunt) {
grunt.registerTask('s', [
'sass'
]);
};

4
project-x/assets/scripts/dist/main.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@@ -384,7 +384,7 @@ textarea {
a {
color: #1A0DAB; }
a:hover {
color: #11097c; }
color: #13097c; }
.container {
position: relative;
@@ -405,12 +405,12 @@ a {
padding-left: 0; }
.grid__item, .whole, .half, .third, .two-thirds, .quarter, .fifth {
font-size: 16px;
display: inline-block;
width: 100%;
margin-bottom: 20px;
padding-left: 20px;
vertical-align: top;
font-size: 16px; }
vertical-align: top; }
@media (min-width: 1024px) {
.half {

View File

@@ -8,18 +8,18 @@
],
"devDependencies": {
"grunt": "0.4.5",
"load-grunt-tasks": "0.6.0",
"load-grunt-tasks": "^0.6.0",
"grunt-contrib-jshint": "^0.10.0",
"grunt-jsonlint": "^1.0.4",
"grunt-phplint": "0.0.5",
"grunt-contrib-watch": "0.6.1",
"grunt-contrib-sass": "0.8.1",
"grunt-sass": "0.14.0",
"grunt-notify": "0.3.1",
"grunt-sass": "^0.16.1",
"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",
"grunt-contrib-imagemin": "^0.8.1",
"grunt-csscomb": "3.0.0",
"grunt-markdown-pdf": "^2.1.1"
}