Skip to content

Commit

Permalink
@mmcc moved the fonts into their own repo. closes #2223
Browse files Browse the repository at this point in the history
  • Loading branch information
mmcc authored and heff committed Jun 2, 2015
1 parent f03a919 commit dac91a7
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 123 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))

--------------------

Expand Down
2 changes: 1 addition & 1 deletion grunt.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
1 change: 0 additions & 1 deletion src/css/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
79 changes: 0 additions & 79 deletions src/css/components/_icons.scss

This file was deleted.

Binary file removed src/css/font/VideoJS.eot
Binary file not shown.
Loading

0 comments on commit dac91a7

Please sign in to comment.