Skip to content

Commit 7442258

Browse files
authored
feat: Add default icons and general project updates (#47)
* update dependencies * grunt.js updates * gallium update, grunt call * remove Google+ icon * v3 icon additions * hbs template updates & readme * formatting fix for hbs * add mdi v4 icons, rearrange order * remove lodash dependency * remove unused gplus svg * babelrc node version to 16 & newline fixes
1 parent b6c2e68 commit 7442258

20 files changed

+11948
-7618
lines changed

.babelrc

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
{
22
"presets": [
3-
["babel-preset-env", {
4-
"targets": {
5-
"node": "4"
3+
[
4+
"@babel/preset-env",
5+
{
6+
"targets": {
7+
"node": "16"
8+
}
69
}
7-
}]
10+
]
811
]
912
}

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lts/*
1+
lts/gallium

Gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require('babel-register');
1+
require('@babel/register');
22

33
module.exports = function(grunt) {
44
require('time-grunt')(grunt);

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Video.js Icon Font
22

33
This project contains all of the tooling necessary to generate a new icon font for Video.js. The icons themselves are from
4-
Google's [Material Design Icons](https://github.com/google/material-design-icons).
4+
Google's [Material Design Icons](https://github.com/google/material-design-icons) (from the commonly available version 3 of the set, with version 4 symbols supplemented as custom SVGs) and [Font Awesome](https://fontawesome.com/).
55

66
You can see an overview of the icons used in the default Video.js font here: https://videojs.github.io/font/
77

@@ -90,4 +90,4 @@ By default, the regular Video.js icons are also included in the font. If you wan
9090
Example:
9191
```sh
9292
$ grunt --custom-json=MyPluginFont.json --exclude-default
93-
```
93+
```

css/videojs-icons.css

+128-44
Large diffs are not rendered by default.

custom-icons/fontawesome/gplus.svg

-1
This file was deleted.

custom-icons/mdi-v4/downloading.svg

+1
Loading

custom-icons/mdi-v4/file_download.svg

+1
Loading
Loading
Loading

fonts/VideoJS.svg

+76-40
Loading

fonts/VideoJS.ttf

3.68 KB
Binary file not shown.

fonts/VideoJS.woff

1.31 KB
Binary file not shown.

icons.json

+65-26
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
}, {
2929
"name": "fullscreen-exit",
3030
"svg": "navigation/svg/production/ic_fullscreen_exit_48px.svg"
31-
}, {
32-
"name": "square",
33-
"svg": "image/svg/production/ic_crop_square_48px.svg"
3431
}, {
3532
"name": "spinner",
3633
"svg": "image/svg/production/ic_camera_48px.svg"
@@ -40,15 +37,37 @@
4037
}, {
4138
"name": "captions",
4239
"svg": "av/svg/production/ic_closed_caption_48px.svg"
40+
}, {
41+
"name": "hd",
42+
"svg": "av/svg/production/ic_hd_24px.svg"
4343
}, {
4444
"name": "chapters",
4545
"svg": "action/svg/production/ic_list_48px.svg"
46+
}, {
47+
"name": "downloading",
48+
"svg": "downloading.svg",
49+
"root-dir": "./custom-icons/mdi-v4/"
50+
}, {
51+
"name": "file-download",
52+
"svg": "file_download.svg",
53+
"root-dir": "./custom-icons/mdi-v4/"
54+
}, {
55+
"name": "file-download-done",
56+
"svg": "file_download_done.svg",
57+
"root-dir": "./custom-icons/mdi-v4/"
58+
}, {
59+
"name": "file-download-off",
60+
"svg": "file_download_off.svg",
61+
"root-dir": "./custom-icons/mdi-v4/"
4662
}, {
4763
"name": "share",
4864
"svg": "social/svg/production/ic_share_48px.svg"
4965
}, {
5066
"name": "cog",
5167
"svg": "action/svg/production/ic_settings_48px.svg"
68+
}, {
69+
"name": "square",
70+
"svg": "image/svg/production/ic_crop_square_48px.svg"
5271
}, {
5372
"name": "circle",
5473
"svg": "image/svg/production/ic_brightness_1_48px.svg"
@@ -58,23 +77,59 @@
5877
}, {
5978
"name": "circle-inner-circle",
6079
"svg": "image/svg/production/ic_adjust_48px.svg"
61-
}, {
62-
"name": "hd",
63-
"svg": "av/svg/production/ic_hd_24px.svg"
6480
}, {
6581
"name": "cancel",
6682
"svg": "navigation/svg/production/ic_cancel_48px.svg"
83+
}, {
84+
"name": "repeat",
85+
"svg": "av/svg/production/ic_repeat_48px.svg"
6786
}, {
6887
"name": "replay",
6988
"svg": "av/svg/production/ic_replay_48px.svg"
89+
}, {
90+
"name": "replay-5",
91+
"svg": "av/svg/production/ic_replay_5_48px.svg"
92+
}, {
93+
"name": "replay-10",
94+
"svg": "av/svg/production/ic_replay_10_48px.svg"
95+
}, {
96+
"name": "replay-30",
97+
"svg": "av/svg/production/ic_replay_30_48px.svg"
98+
}, {
99+
"name": "forward-5",
100+
"svg": "av/svg/production/ic_forward_5_48px.svg"
101+
}, {
102+
"name": "forward-10",
103+
"svg": "av/svg/production/ic_forward_10_48px.svg"
104+
}, {
105+
"name": "forward-30",
106+
"svg": "av/svg/production/ic_forward_30_48px.svg"
107+
}, {
108+
"name": "audio",
109+
"svg": "hardware/svg/production/ic_headset_48px.svg"
110+
}, {
111+
"name": "next-item",
112+
"svg": "av/svg/production/ic_skip_next_48px.svg"
113+
}, {
114+
"name": "previous-item",
115+
"svg": "av/svg/production/ic_skip_previous_48px.svg"
116+
}, {
117+
"name": "shuffle",
118+
"svg": "av/svg/production/ic_shuffle_48px.svg"
119+
}, {
120+
"name": "cast",
121+
"svg": "hardware/svg/production/ic_cast_48px.svg"
122+
}, {
123+
"name": "picture-in-picture-enter",
124+
"svg": "action/svg/production/ic_picture_in_picture_alt_48px.svg"
125+
}, {
126+
"name": "picture-in-picture-exit",
127+
"svg": "picture-in-picture-exit.svg",
128+
"root-dir": "./custom-icons/"
70129
}, {
71130
"name": "facebook",
72131
"svg": "facebook.svg",
73132
"root-dir": "./custom-icons/fontawesome/"
74-
}, {
75-
"name": "gplus",
76-
"svg": "gplus.svg",
77-
"root-dir": "./custom-icons/fontawesome/"
78133
}, {
79134
"name": "linkedin",
80135
"svg": "linkedin.svg",
@@ -95,21 +150,5 @@
95150
"name": "audio-description",
96151
"svg": "audio-description.svg",
97152
"root-dir": "./custom-icons/"
98-
}, {
99-
"name": "audio",
100-
"svg": "hardware/svg/production/ic_headset_48px.svg"
101-
}, {
102-
"name": "next-item",
103-
"svg": "av/svg/production/ic_skip_next_48px.svg"
104-
}, {
105-
"name": "previous-item",
106-
"svg": "av/svg/production/ic_skip_previous_48px.svg"
107-
}, {
108-
"name": "picture-in-picture-enter",
109-
"svg": "action/svg/production/ic_picture_in_picture_alt_48px.svg"
110-
}, {
111-
"name": "picture-in-picture-exit",
112-
"svg": "picture-in-picture-exit.svg",
113-
"root-dir": "./custom-icons/"
114153
}]
115154
}

0 commit comments

Comments
 (0)