Browse Source

fixed bug with css concat and switched to concat instead concat_css grunt task

Former-commit-id: 2097dac76c
Former-commit-id: bac52d98c0
pull/258/head
Emad Ibrahim 11 years ago
parent
commit
136037d7fd
5 changed files with 8 additions and 8 deletions
  1. 2
      build/packaged/css/semantic.css.REMOVED.git-id
  2. 8
      node/Gruntfile.js
  3. 2
      node/package.json
  4. 2
      node/src/files/build/packaged/css/semantic.css.REMOVED.git-id
  5. 2
      node/src/files/build/semantic.zip.REMOVED.git-id

2
build/packaged/css/semantic.css.REMOVED.git-id

@ -1 +1 @@
42601c5eac116dc2163afa373661232e4ab92a77
60b10350579290e8160af90d782d56b9dcdc9ba6

8
node/Gruntfile.js

@ -39,7 +39,7 @@ module.exports = function(grunt) {
// creates custom license in header // creates custom license in header
'cssmin:addBanner', 'cssmin:addBanner',
'concat_css',
'concat',
// creates minified js of each file // creates minified js of each file
'uglify:minifyJS', 'uglify:minifyJS',
@ -255,9 +255,8 @@ module.exports = function(grunt) {
} }
}, },
concat_css: {
concat: {
options: { options: {
// Task-specific options go here.
}, },
all: { all: {
src: ["../build/uncompressed/**/*.css"], src: ["../build/uncompressed/**/*.css"],
@ -365,7 +364,8 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-docco'); grunt.loadNpmTasks('grunt-docco');
grunt.loadNpmTasks('grunt-concat-css');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.initConfig(config); grunt.initConfig(config);

2
node/package.json

@ -21,6 +21,6 @@
"grunt-bower-task": "~0.3.1", "grunt-bower-task": "~0.3.1",
"grunt-css": "~0.5.4", "grunt-css": "~0.5.4",
"grunt-contrib-compress": "~0.5.2", "grunt-contrib-compress": "~0.5.2",
"grunt-concat-css": "~0.1.0"
"grunt-contrib-concat": "~0.3.0"
} }
} }

2
node/src/files/build/packaged/css/semantic.css.REMOVED.git-id

@ -1 +1 @@
42601c5eac116dc2163afa373661232e4ab92a77
60b10350579290e8160af90d782d56b9dcdc9ba6

2
node/src/files/build/semantic.zip.REMOVED.git-id

@ -1 +1 @@
4d4745c7740213e1a47a87c9477d8f552668e58c
7d0857778e0b16a10e63aa198dcc3268cc516ec0
Loading…
Cancel
Save