web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-01-08 07:00:10 +02:00
Code Releases Activity

@erikyuzwa reworked build to separate out IE8-specific CSS

Browse Source
This commit is contained in:
Erik Yuzwa 2016-06-17 21:50:54 -06:00 committed by Gary Katsevman
parent 052c2ce1a9
commit d86d4b2222
3 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build/grunt.js
View File

@ -182,11 +182,9 @@ module.exports = function(grunt) {
}, },
cssmin: { cssmin: {
minify: { minify: {
expand: true, files: {
cwd: 'build/temp/', 'build/temp/video-js.min.css': ['build/temp/video-js.css', 'build/temp/alt/video-js-cdn.css', 'src/css/ie8.css']
src: ['video-js.css', 'alt/video-js-cdn.css'], }
dest: 'build/temp/',
ext: '.min.css'
} }
}, },
sass: { sass: {
@ -382,20 +380,17 @@ module.exports = function(grunt) {
} }
}, },
concat: { concat: {
options: {
separator: '\n'
},
novtt: { novtt: {
options: {
separator: '\n'
},
src: ['build/temp/video.js'], src: ['build/temp/video.js'],
dest: 'build/temp/alt/video.novtt.js' dest: 'build/temp/alt/video.novtt.js'
}, },
vtt: { vtt: {
options: {
separator: '\n',
},
src: ['build/temp/video.js', 'node_modules/videojs-vtt.js/dist/vtt.js'], src: ['build/temp/video.js', 'node_modules/videojs-vtt.js/dist/vtt.js'],
dest: 'build/temp/video.js', dest: 'build/temp/video.js'
}, }
}, },
concurrent: { concurrent: {
options: { options: {

16
src/css/components/_control-bar.scss
View File

@ -20,9 +20,6 @@
@include transition($trans); @include transition($trans);
} }
// IE 8 hack for media queries
$ie8screen: "\\0screen";
// Video has started playing AND user is inactive // Video has started playing AND user is inactive
.vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar { .vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar {
// Remain visible for screen reader and keyboard users // Remain visible for screen reader and keyboard users
@ -32,10 +29,6 @@ $ie8screen: "\\0screen";
$trans: visibility 1.0s, opacity 1.0s; $trans: visibility 1.0s, opacity 1.0s;
@include transition($trans); @include transition($trans);
// Make controls hidden in IE8 for now
@media #{$ie8screen} {
visibility: hidden;
}
} }
.vjs-controls-disabled .vjs-control-bar, .vjs-controls-disabled .vjs-control-bar,
@ -51,15 +44,6 @@ $ie8screen: "\\0screen";
visibility: visible; visibility: visible;
} }
// IE8 is flakey with fonts, and you have to change the actual content to force
// fonts to show/hide properly.
// - "\9" IE8 hack didn't work for this
// Found in XP IE8 from http://modern.ie. Does not show up in "IE8 mode" in IE9
.vjs-user-inactive.vjs-playing .vjs-control-bar :before {
@media #{$ie8screen} { content: ""; }
}
// IE 8 + 9 Support // IE 8 + 9 Support
.vjs-has-started.vjs-no-flex .vjs-control-bar { .vjs-has-started.vjs-no-flex .vjs-control-bar {
display: table; display: table;

30
src/css/ie8.css Normal file
View File

@ -0,0 +1,30 @@
/**
// IE 8 hack for media queries which the sass parser can encounter problems with
$ie8screen: "\\0screen";
// original home: css/components/_control-bar.scss
// IE8 is flakey with fonts, and you have to change the actual content to force
// fonts to show/hide properly.
// - "\9" IE8 hack didn't work for this
// Found in XP IE8 from http://modern.ie. Does not show up in "IE8 mode" in IE9
.vjs-user-inactive.vjs-playing .vjs-control-bar :before {
@media #{$ie8screen} { content: ""; }
}
// Video has started playing AND user is inactive
.vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar {
// Make controls hidden in IE8 for now
@media #{$ie8screen} {
visibility: hidden;
}
}
*/
@media \0screen {
.vjs-user-inactive.vjs-playing .vjs-control-bar :before {
content: ""; } }
@media \0screen {
.vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar {
visibility: hidden; } }