Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move fonts out of core repo #2223

Closed
wants to merge 3 commits into from
Closed

Move fonts out of core repo #2223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa35c6f
Use the videojs-font project instead of local fonts
mmcc Jun 1, 2015
8470c45
deleted old references to the font
mmcc Jun 1, 2015
9887e73
reverted grunt.js formatting changes
mmcc Jun 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grunt.js
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we not still set this here anyway? How might someone override it with their own? If that's a real use case.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If someone was overriding it with there own, they'd probably want to override all of the icons partial basically (at least that was my thought).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, that makes sense

$base-font-size: 10px;

Expand Down
79 changes: 0 additions & 79 deletions src/css/components/_icons.scss
View file
Open in desktop

This file was deleted.

Binary file removed src/css/font/VideoJS.eot
View file
Open in desktop
Binary file not shown.
Loading