diff --git a/CHANGELOG.md b/CHANGELOG.md index eb06ed3a68..c225c7a0e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ CHANGELOG * @heff Reverted .video-js inline-block style to fix Flash fullscreen ([view](https://github.com/videojs/video.js/pull/2217)) * @mmcc switched to using button elements for button components ([view](https://github.com/videojs/video.js/pull/2209)) * @mmcc increased the size of the progress bar and handle on hover ([view](https://github.com/videojs/video.js/pull/2216)) +* @mmcc moved the fonts into their own repo ([view](https://github.com/videojs/video.js/pull/2223)) -------------------- diff --git a/grunt.js b/grunt.js index 97862f895b..85f4314877 100644 --- a/grunt.js +++ b/grunt.js @@ -89,7 +89,7 @@ module.exports = function(grunt) { {expand: true, cwd: 'build/temp/', src: ['*'], dest: 'dist/'+version.full+'/', filter: 'isFile'} // includes files in path ] }, - fonts: { expand: true, cwd: 'src/css/font/', src: ['*'], dest: 'build/temp/font/', filter: 'isFile' }, + fonts: { expand: true, cwd: './node_modules/videojs-font/fonts/', src: ['*'], dest: 'build/temp/font/', filter: 'isFile' }, swf: { src: './node_modules/videojs-swf/dist/video-js.swf', dest: './build/temp/video-js.swf' }, novtt: { src: './build/temp/video.js', dest: './build/temp/alt/video.novtt.js' }, dist: { expand: true, cwd: 'build/temp/', src: ['**/**'], dest: 'dist/', filter: 'isFile' }, diff --git a/package.json b/package.json index 8d9fb364b6..50f7feb38e 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,8 @@ "sinon": "~1.9.1", "time-grunt": "^1.1.1", "uglify-js": "~2.3.6", - "videojs-doc-generator": "0.0.1" + "videojs-doc-generator": "0.0.1", + "videojs-font": "^1.1.0" }, "standard": { "ignore": [ diff --git a/src/css/_variables.scss b/src/css/_variables.scss index 80e28b1a71..48d3a2eeea 100644 --- a/src/css/_variables.scss +++ b/src/css/_variables.scss @@ -4,7 +4,6 @@ $secondary-text: #F4A460; // currently just used for visited links in errors and $primary-bg: #000; $secondary-bg: lighten($primary-bg, 35%); -$icon-font-family: 'VideoJS'; $text-font-family: Arial, Helvetica, sans-serif; $base-font-size: 10px; diff --git a/src/css/components/_icons.scss b/src/css/components/_icons.scss deleted file mode 100644 index 88cfa134b7..0000000000 --- a/src/css/components/_icons.scss +++ /dev/null @@ -1,79 +0,0 @@ -@font-face { - font-family: $icon-font-family; - src: url('font/VideoJS.eot'); -} -@font-face { - font-family: $icon-font-family; - src: url(data:application/x-font-ttf;charset=utf-8;base64,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) format('truetype'), - url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAA/0AAsAAAAAD6gAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABCAAAAGAAAABgKGL/Z2NtYXAAAAFoAAAA7AAAAOzja1qUZ2FzcAAAAlQAAAAIAAAACAAAABBnbHlmAAACXAAACuQAAArk1SUa1mhlYWQAAA1AAAAANgAAADYCrgspaGhlYQAADXgAAAAkAAAAJAPNAgNobXR4AAANnAAAAIgAAACIPQAIwGxvY2EAAA4kAAAARgAAAEYqHCcQbWF4cAAADmwAAAAgAAAAIAApAF5uYW1lAAAOjAAAAUUAAAFF0awydHBvc3QAAA/UAAAAIAAAACAAAwAAAAMCAAGQAAUAAAFMAWYAAABHAUwBZgAAAPUAGQCEAAAAAAAAAAAAAAAAAAAAARAAIAAAAAAAAAAAAAAAAAAAQAAA6LEB4P/gACAB4AAgAAAAAQAAAAAAAAAAAAAAIAAAAAAAAgAAAAMAAAAUAAMAAQAAABQABADYAAAAMgAgAAQAEgABACAltuYB5gPmGuZM5lDmkubi5vLnE+gN6B7oIugl6DLoNehB6EzoZuiR6LH//f//AAAAAAAgJbbmAeYD5hrmS+ZQ5pLm4uby5xPoDege6CHoJegw6DToQOhJ6Gbokeix//3//wAB/+PaThoEGgMZ7Rm9GboZeRkqGRsY+xgCF/IX8BfuF+QX4xfZF9IXuRePF3AAAwABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAB//8ADwABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAAAQAAAAAAAAAAAAIAADc5AQAAAAABAKsASwGVAXUAAgAAExE3q+oBdf7WlQACAEAAIAHAAaAABAAVAAABESERITUhIgYVERQWMyEyNjURNCYjAZX+1gEq/tYSGRkSASoSGRkSAXX+1gEqKxkS/tYSGRkSASoSGQAAAwArAAsB1QG1AAwAGQAmAAABIgYVFBYzMjY1NCYjNSIGFRQWMzI2NTQmIxEiJjU0NjMyFhUUBiMBACw/PywsPz8sWH19WFh9fVhHZGRHR2RkRwFLPywsPz8sLD9qfVhYfX1YWH3+gGRHR2RkR0dkAAEAQAAMAcABtQA0AAAlIgYHJz4BNTQmJzceATMyNjU0JiMiBhUUFhcHLgEjIgYVFBYzMjY3Fw4BFRQWMzI2NTQmIwGADBYImAEBAQGWCRYNGiYmGhomAQGWCRYNGiYmGg0WCZgBASQaGiQkGokJCFkEBwQEBwRYCAomGhslJRsDCANYCAkmGhomCQhYBAcDGiUlGhklAAAABABrAEsBlQF1AAYADQAUABsAADcjFTM1IzUnMzUzNSMVBSMVMzUjFQMVMxUzNSOVKmpAKipAagEAQGoqQEAqarVqKkBWQCpqlipqQAEAKkBqAAAABABrAEsBlQF1AAYADQAUABsAADczFTM1IxU3IxUzNSMVFzM1MzUjFTc1IxUzNSNrQCpqQEBqKoAqQGoqKmpAi0BqKqoqakDqQCpq6kBqKgABAFYANQGrAYsAHQAAAS4BIyIGFRQWMzI2NyMOASMiJjU0NjMyFhcHMzUHAXkYPiNHY2NHPFsOLA5BKjVLSzUaLxFFljIBWRcbZEdHZEk3JTBLNTVLFRFFljIAAAEAKwALAdUBtQAMAAAlFAYjIiY1NDYzMhYVAdV9WFh9fVhYfeBYfX1YWH19WAAAAAEAKwALAdUBtQAMAAABIgYVFBYzMjY1NCYjAQBYfX1YWH19WAG1fVhYfX1YWH0AAAIAKwALAdUBtQAMABkAAAEiBhUUFjMyNjU0JiMRIiY1NDYzMhYVFAYjAQBYfX1YWH19WEdkZEdHZGRHAbV9WFh9fVhYff6AZEdHZGRHR2QABAAVACAB6wGgABMAGQAiACsAAAEhIgYdATM1IREjFTMyNjURNCYjARUzNCYjNRUyFhUzNCYjNRUyFhUzNCYjAcD+gBIZKwGAlZUSGRkS/lVAJRssPytYPlBwK4liAaAZEkBA/tYrGRIBKhIZ/sBAGiZVKj8sPldWK3BQYYoAAAAFACsANQHVAYsAEAAVABoAHwAkAAABISIGFREUFjMhMjY1ETQmIwUzFSM1FyM1MxUzIzUzFTUjNTMVAav+qhEZGREBVhEZGRH+qlZW1tbWgFZW1tYBixkS/wASGRkSAQASGasrK4ArKysrVSsrAAAAAwBAADUBwAGLABAAKQBCAAABISIGFREUFjMhMjY1ETQmIwcjNSMVMzUzFRQGKwEiJj0BNDY7ATIWHQEzIzUjFTM1MxUUBisBIiY9ATQ2OwEyFh0BAZX+1hIZGRIBKhIZGRKqICsrIA0JQAkMDAlACQ2VICsrIAwJQAkNDQlACQwBixkS/wASGRkSAQASGZYLQAsWCA0NCFYIDQ0IFgtACxYIDQ0IVggNDQgWAAIAVQBgAcsBYAADAAcAAD8BJxETETcnVba2wLa2YICA/wABAP8AgIAAAAAAAgA1AGABqwFgAAMABwAANxEHFzcXEQfrtrYKtrZgAQCAgICAAQCAAAQAQAA1AcABiwAQAB0AMgA3AAABISIGFREUFjMhMjY1ETQmIwcjNSMVIzUzFTM1MxU3FAYrARUjNSMiJj0BNDY7ATIWHQEnMzUjFQGV/tYSGRkSASoSGRkSqiArICArIJUMCRAgEAkNDQlACQxLKysBixkS/wASGRkSAQASGesrK4A1NYAVCA0gIA0IVggNDQhWC0BAAAAAAgCAAEsBgAF1AAQACQAANzMRIxETETMRI4BVVatVVUsBKv7WASr+1gEqAAADACsACwHVAbUADAARABYAAAEiBhUUFjMyNjU0JiMDIzUzFTMjNTMVAQBYfX1YWH19WBUrK1UrKwG1fVhYfX1YWH3+1qqqqqoAAAAABAArAAsB1QG1AAQAEQAeACMAADczNSMVEyIGFRQWMzI2NTQmIxEiJjU0NjMyFhUUBiM3MzUjFcArK0BYfX1YWH19WEdkZEdHZGRHFSsri6qqASp9WFh9fVhYff6AZEdHZGRHR2RWqqoAAAAAAgArAAsB1QG1AAwAEAAAASIGFRQWMzI2NTQmIwM1FwcBAFh9fVhYfX1YK4CAAbV9WFh9fVhYff7LwGBgAAAAAAMAKwALAdUBtQADABAAHQAAPwEnFRMiBhUUFjMyNjU0JiMRIiY1NDYzMhYVFAYj1YCAK1h9fVhYfX1YR2RkR0dkZEeAYGDAATV9WFh9fVhYff6AZEdHZGRHR2QAAgCAAGABgAFgAAMACAAAPwEnERMRMxEjgLW11SsrYICA/wABAP8AAQAAAAACAIAAYAGAAWAAAwAGAAATMxEjNxcRgCsrS7UBYP8AgIABAAACAGsANQGLAYsABwAOAAAlNCYnFT4BNSUVMxcRByMBix4YGB7+4FVra1XgHC4MrAwuHECAawFWawAAAAABAJUANQFVAYsABgAAExUzFxEHI5VWampWASCAawFWawAAAAAEAEAAIAHAAaAACAAXACoALgAAJTQmJxUXNjQ1MxQGBxc+ATU0JicVHgEVJQcXIxUzFzUXDgEHFT4BNxc3ARcHFzUBYB4XNAE1BgUgCwtVQC48/sYbZWVVa1sLGA0WJxEsG/6bpS0t4BwuDC81BAcDDxwNIRQtGERpDiwOTjPAG2WAa5BbCA0ELAUUDSsbAWUVLS1aAAAAAAMAQAAlAcABmwAGAA4AHQAAExUzFxEHIwU0JicVPgE1JxUeARUUBgcVPgE1NCYnQFVra1UBIB4XFx41Ljw8LkBVVUABIIBrAVZrQBwuDKwMLhy7LA5OMzNODiwOaEVFaA4AAAACAFX/9QGrAcsAEQAjAAABFTcnFSIGFRQWFzcuATU0NjMXBx4BFRQGIzUHFzUyNjU0JicBAFVVR2QODR8HCEs1kB8HCEs1VVVHZA4NAWBAVVZAZEcZLhQfDh4QNUslHw4eEDVLQFVWQGRHGS4UAAAABgBAAHUBwAFLAAQACQAOABMAGAAdAAA3MzUjFRUzNSMVNTM1IxUXITUhFRUhNSEVNRUhNSFAKysrKysrVQEr/tUBK/7VASv+1csqKlYrK6srK1UqKlYrK9YrKwACADIACwHOAbUATgBbAAAlNDY1NCY1Nz4BLwEuAQ8BLgEvATQmKwEiBhUHDgEHJyYGDwEGFh8BFAYVFBYVBw4BHwEeAT8BHgEfARQWOwEyNjU3PgE3FxY2PwE2Ji8BByImNTQ2MzIWFRQGIwGfAQEtAwECKgIIAzYIEgoIBgRWBAYIChIINQQHAisCAQMtAQEtAwECKwIHBDUIEgoIBgRWBAYIChIINQQHAisCAQMtnx8sLB8fLCwfywULBQULBSMDBwRKAwMCFQYLBDgEBQUEOAQLBhUCAwNKBAcDIwULBQULBSMDBwRKAwMCFQYLBDgEBQUEOAQLBhUCAwNKBAcDIzYsHx8sLB8fLAAAAQAAAAEAAP1v+khfDzz1AAsCAAAAAADQ0eU2AAAAANDR5TYAAP/1AesBywAAAAgAAgAAAAAAAAABAAAB4P/gAAACAAAAAAAB6wABAAAAAAAAAAAAAAAAAAAAIgAAAAAAAAAAAAAAAAEAAAACAACrAgAAQAIAACsCAABAAgAAawIAAGsCAABWAgAAKwIAACsCAAArAgAAFQIAACsCAABAAgAAVQIAADUCAABAAgAAgAIAACsCAAArAgAAKwIAACsCAACAAgAAgAIAAGsCAACVAgAAQAIAAEACAABVAgAAQAIAADIAAAAAAAoAFAAeACoAUACIANQA/gEmAVQBbAGEAawB7AIkAnoCkAKkAvADBgMsA2IDggOwA8YD2AP2BAgEVASGBL4E7AVyAAAAAQAAACIAXAAGAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAA4ArgABAAAAAAABAA4AAAABAAAAAAACAA4ARwABAAAAAAADAA4AJAABAAAAAAAEAA4AVQABAAAAAAAFABYADgABAAAAAAAGAAcAMgABAAAAAAAKADQAYwADAAEECQABAA4AAAADAAEECQACAA4ARwADAAEECQADAA4AJAADAAEECQAEAA4AVQADAAEECQAFABYADgADAAEECQAGAA4AOQADAAEECQAKADQAYwBWAGkAZABlAG8ASgBTAFYAZQByAHMAaQBvAG4AIAAxAC4AMABWAGkAZABlAG8ASgBTVmlkZW9KUwBWAGkAZABlAG8ASgBTAFIAZQBnAHUAbABhAHIAVgBpAGQAZQBvAEoAUwBGAG8AbgB0ACAAZwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABJAGMAbwBNAG8AbwBuAC4AAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==) format('woff'); - font-weight: normal; - font-style: normal; -} - -// http://sass-lang.com/documentation/file.SASS_REFERENCE.html#maps -$icons: ( - play: "\25b6", - pause: "\e830", - volume-mute: "\e84b", - volume-low: "\e84a", - volume-mid: "\e849", - volume-high: "\e84c", - fullscreen-enter: "\e64b", - fullscreen-exit: "\e64c", - square: "\e601", - spinner: "\e650", - subtitles: "\e80d", - captions: "\e81e", - chapters: "\e891", - share: "\e61a", - cog: "\e8b1", - circle: "\e692", - circle-outline: "\e6f2", - circle-inner-circle: "\e603" -); - -// NOTE: This is as complex as we want to get with SCSS functionality. -// -// Now that we have a map of icons above, we can iterate over that map and create an icon class -// for each icon in that list. The iterator below produces CSS classes like this: -// -// .vjs-icon-play { -// font-family: VideoJS; -// font-weight: normal; -// font-style: normal; -// } -// .vjs-icon-play:before { content: "\25b6"; } -// -// We can then use @extend in the codebase when we need to add an icon to a class. @extend builds up -// the selectors for you so you can avoid duplication. This is generally a bad idea, but since each -// icon should only be extended one or two other places, we'll roll with it. -@each $name, $content in $icons { - .vjs-icon-#{$name} { - font-family: $icon-font-family; - font-weight: normal; - font-style: normal; - - &:before { - content: $content; - } - } -} - -// $icon-play: "\25b6"; -// $icon-pause: "\e830"; -// $icon-volume-mute: "\e84b"; -// $icon-volume-low: "\e84a"; -// $icon-volume-mid: "\e849"; -// $icon-volume-high: "\e84c"; -// $icon-fullscreen-enter: "\e64b"; -// $icon-fullscreen-exit: "\e64c"; -// $icon-square: "\e009"; -// $icon-spinner: "\e650"; -// $icon-subtitles: "\e80d"; -// $icon-captions: "\e81e"; -// $icon-chapters: "\e891"; -// $icon-share: "\e61a"; -// $icon-cog: "\e8b1"; -// $icon-circle: "\e692"; -// $icon-circle-outline: "\e6f2"; -// $icon-circle-inner-circle: "\e603"; diff --git a/src/css/font/VideoJS.eot b/src/css/font/VideoJS.eot deleted file mode 100755 index 5d29e5adf1..0000000000 Binary files a/src/css/font/VideoJS.eot and /dev/null differ diff --git a/src/css/font/VideoJS.svg b/src/css/font/VideoJS.svg deleted file mode 100755 index d9a39d7b6f..0000000000 --- a/src/css/font/VideoJS.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/css/font/VideoJS.ttf b/src/css/font/VideoJS.ttf deleted file mode 100755 index bf0b443c68..0000000000 Binary files a/src/css/font/VideoJS.ttf and /dev/null differ diff --git a/src/css/font/VideoJS.woff b/src/css/font/VideoJS.woff deleted file mode 100755 index e130b76c51..0000000000 Binary files a/src/css/font/VideoJS.woff and /dev/null differ diff --git a/src/css/video-js.scss b/src/css/video-js.scss index 2eb54ef545..5b00227e0a 100644 --- a/src/css/video-js.scss +++ b/src/css/video-js.scss @@ -1,7 +1,8 @@ @import "variables"; @import "utilities"; -@import "components/icons"; +@import "../../node_modules/videojs-font/scss/icons"; + @import "components/layout"; @import "components/big-play"; @import "components/button";