1
0
mirror of https://github.com/videojs/video.js.git synced 2024-11-24 08:42:25 +02:00

@gkatsev modified ie8.css build process

This commit is contained in:
Gary Katsevman 2016-07-18 16:27:43 -04:00
parent d86d4b2222
commit 1ff9f381a2
2 changed files with 17 additions and 6 deletions

View File

@ -5,6 +5,7 @@ CHANGELOG
* @misteroneill, @BrandonOCasey, and @pagarwal123 updates all the code to pass the linter ([view](https://github.com/videojs/video.js/pull/3459))
* @misteroneill added ghooks to run linter on git push ([view](https://github.com/videojs/video.js/pull/3459))
* @BrandonOCasey removed unused base-styles.js file ([view](https://github.com/videojs/video.js/pull/3486))
* @erikyuzwa, @gkatsev updated CSS build to inlcude the IE8-specific CSS from a separate file instead of it being inside of sass ([view](https://github.com/videojs/video.js/pull/3380)) ([view2](https://github.com/erikyuzwa/video.js/pull/1))
--------------------

View File

@ -151,7 +151,11 @@ module.exports = function(grunt) {
},
skin: {
files: ['src/css/**/*'],
tasks: ['sass']
tasks: ['skin']
},
jshint: {
files: ['src/**/*', 'test/unit/**/*.js', 'Gruntfile.js'],
tasks: 'jshint'
}
},
connect: {
@ -182,9 +186,11 @@ module.exports = function(grunt) {
},
cssmin: {
minify: {
files: {
'build/temp/video-js.min.css': ['build/temp/video-js.css', 'build/temp/alt/video-js-cdn.css', 'src/css/ie8.css']
}
expand: true,
cwd: 'build/temp/',
src: ['video-js.css', 'alt/video-js-cdn.css'],
dest: 'build/temp/',
ext: '.min.css'
}
},
sass: {
@ -390,6 +396,10 @@ module.exports = function(grunt) {
vtt: {
src: ['build/temp/video.js', 'node_modules/videojs-vtt.js/dist/vtt.js'],
dest: 'build/temp/video.js'
},
ie8_addition: {
src: ['build/temp/video-js.css', 'src/css/ie8.css'],
dest: 'build/temp/video-js.css'
}
},
concurrent: {
@ -454,7 +464,7 @@ module.exports = function(grunt) {
'usebanner:vtt',
'uglify',
'sass',
'skin',
'version:css',
'cssmin',
@ -479,7 +489,7 @@ module.exports = function(grunt) {
'zip:dist'
]);
grunt.registerTask('skin', ['sass']);
grunt.registerTask('skin', ['sass', 'concat:ie8_addition']);
// Default task - build and test
grunt.registerTask('default', ['test']);