Skip to content

Commit

Permalink
Merge pull request #431 from cloudinary/edge
Browse files Browse the repository at this point in the history
Update master
  • Loading branch information
tsi authored Sep 12, 2023
2 parents 82de179 + fc31ccc commit 15f2b48
Show file tree
Hide file tree
Showing 51 changed files with 719 additions and 1,315 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
1.9.16 / 2023-09-12
==================

* Video player face-lift - redesigned themes, icons, volume-bar.

1.9.15 / 2023-08-30
==================

* Support camelCase cloud config (i.e. cloudName)
* Use cloudinary-video-analytics
* Collect video player usage


1.9.15 / 2023-08-29
==================

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cloudinary-video-player",
"version": "1.9.15",
"version": "1.9.17-edge.0",
"description": "Cloudinary Video Player",
"author": "Cloudinary",
"license": "MIT",
Expand Down
120 changes: 0 additions & 120 deletions src/assets/fonts/VideoJS.svg

This file was deleted.

Binary file removed src/assets/fonts/VideoJS.ttf
Binary file not shown.
Binary file removed src/assets/fonts/VideoJS.woff
Binary file not shown.
5 changes: 5 additions & 0 deletions src/assets/icon-font/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Cloudinary Video Player Icons

## How to generate an updated icon-font

Use the utility from https://github.com/videojs/font with the custom icons in the `cld` folder and the configuration in the `icons.json` provided here.
159 changes: 159 additions & 0 deletions src/assets/icon-font/VideoJS.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icon-font/VideoJS.ttf
Binary file not shown.
Binary file added src/assets/icon-font/VideoJS.woff
Binary file not shown.
5 changes: 5 additions & 0 deletions src/assets/icon-font/custom-icons/cld/check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon-font/custom-icons/cld/forward-10.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon-font/custom-icons/cld/fullscreen-exit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon-font/custom-icons/cld/fullscreen.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon-font/custom-icons/cld/pause.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon-font/custom-icons/cld/play.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon-font/custom-icons/cld/replay-10.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon-font/custom-icons/cld/settings.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon-font/custom-icons/cld/subtitles-off.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon-font/custom-icons/cld/subtitles-on.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon-font/custom-icons/cld/volume-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon-font/custom-icons/cld/volume-off.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icon-font/custom-icons/cld/volume-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
124 changes: 93 additions & 31 deletions src/assets/fonts/icons.json → src/assets/icon-font/icons.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,82 @@
"root-dir": "./node_modules/material-design-icons/",
"icons": [{
"name": "play",
"svg": "av/svg/production/ic_play_arrow_48px.svg"
"svg": "play.svg",
"root-dir": "./custom-icons/cld/"
}, {
"name": "play-circle",
"svg": "av/svg/production/ic_play_circle_outline_48px.svg"
}, {
"name": "pause",
"svg": "av/svg/production/ic_pause_48px.svg"
"svg": "pause.svg",
"root-dir": "./custom-icons/cld/"
}, {
"name": "volume-mute",
"svg": "av/svg/production/ic_volume_off_48px.svg"
"svg": "volume-off.svg",
"root-dir": "./custom-icons/cld/"
}, {
"TODO": "missing custom icon",
"name": "volume-low",
"svg": "av/svg/production/ic_volume_mute_48px.svg"
}, {
"name": "volume-mid",
"svg": "av/svg/production/ic_volume_down_48px.svg"
"svg": "volume-down.svg",
"root-dir": "./custom-icons/cld/"
}, {
"name": "volume-high",
"svg": "av/svg/production/ic_volume_up_48px.svg"
"svg": "volume-up.svg",
"root-dir": "./custom-icons/cld/"
}, {
"name": "fullscreen-enter",
"svg": "navigation/svg/production/ic_fullscreen_48px.svg"
"svg": "fullscreen.svg",
"root-dir": "./custom-icons/cld/"
}, {
"name": "fullscreen-exit",
"svg": "navigation/svg/production/ic_fullscreen_exit_48px.svg"
}, {
"name": "square",
"svg": "image/svg/production/ic_crop_square_48px.svg"
"svg": "fullscreen-exit.svg",
"root-dir": "./custom-icons/cld/"
}, {
"name": "spinner",
"svg": "image/svg/production/ic_camera_48px.svg"
}, {
"TODO": "there's no subtitles off icon, not a toggle",
"name": "subtitles",
"svg": "av/svg/production/ic_subtitles_48px.svg"
"svg": "subtitles-on.svg",
"root-dir": "./custom-icons/cld/"
}, {
"name": "captions",
"svg": "av/svg/production/ic_closed_caption_48px.svg"
}, {
"name": "hd",
"svg": "av/svg/production/ic_hd_24px.svg"
}, {
"name": "chapters",
"svg": "action/svg/production/ic_list_48px.svg"
}, {
"name": "downloading",
"svg": "downloading.svg",
"root-dir": "./custom-icons/mdi-v4/"
}, {
"name": "file-download",
"svg": "file_download.svg",
"root-dir": "./custom-icons/mdi-v4/"
}, {
"name": "file-download-done",
"svg": "file_download_done.svg",
"root-dir": "./custom-icons/mdi-v4/"
}, {
"name": "file-download-off",
"svg": "file_download_off.svg",
"root-dir": "./custom-icons/mdi-v4/"
}, {
"name": "share",
"svg": "social/svg/production/ic_share_48px.svg"
}, {
"name": "cog",
"svg": "action/svg/production/ic_settings_48px.svg"
"svg": "settings.svg",
"root-dir": "./custom-icons/cld/"
}, {
"name": "square",
"svg": "image/svg/production/ic_crop_square_48px.svg"
}, {
"name": "circle",
"svg": "image/svg/production/ic_brightness_1_48px.svg"
Expand All @@ -58,38 +88,69 @@
}, {
"name": "circle-inner-circle",
"svg": "image/svg/production/ic_adjust_48px.svg"
}, {
"name": "hd",
"svg": "av/svg/production/ic_hd_24px.svg"
}, {
"name": "cancel",
"svg": "navigation/svg/production/ic_cancel_48px.svg"
}, {
"name": "repeat",
"svg": "av/svg/production/ic_repeat_48px.svg"
}, {
"name": "replay",
"svg": "av/svg/production/ic_replay_48px.svg"
}, {
"name": "play-previous",
"svg": "av/svg/production/ic_skip_previous_48px.svg"
"name": "replay-5",
"svg": "replay-5.svg",
"root-dir": "./custom-icons/skip-forward-backward/"
}, {
"name": "replay-10",
"svg": "replay-10.svg",
"root-dir": "./custom-icons/cld/"
}, {
"name": "replay-30",
"svg": "replay-30.svg",
"root-dir": "./custom-icons/skip-forward-backward/"
}, {
"name": "play-next",
"name": "forward-5",
"svg": "forward-5.svg",
"root-dir": "./custom-icons/skip-forward-backward/"
}, {
"name": "forward-10",
"svg": "forward-10.svg",
"root-dir": "./custom-icons/cld/"
}, {
"name": "forward-30",
"svg": "forward-30.svg",
"root-dir": "./custom-icons/skip-forward-backward/"
}, {
"name": "audio",
"svg": "hardware/svg/production/ic_headset_48px.svg"
}, {
"name": "next-item",
"svg": "av/svg/production/ic_skip_next_48px.svg"
}, {
"name": "close",
"svg": "navigation/svg/production/ic_close_48px.svg"
"name": "previous-item",
"svg": "av/svg/production/ic_skip_previous_48px.svg"
}, {
"name": "shuffle",
"svg": "av/svg/production/ic_shuffle_48px.svg"
}, {
"name": "skip-10-min",
"svg": "av/svg/production/ic_replay_10_48px.svg"
"name": "cast",
"svg": "hardware/svg/production/ic_cast_48px.svg"
}, {
"name": "skip-10-plus",
"svg": "av/svg/production/ic_forward_10_48px.svg"
"name": "picture-in-picture-enter",
"svg": "picture-in-picture-on.svg",
"root-dir": "./custom-icons/cld/"
}, {
"name": "picture-in-picture-exit",
"svg": "picture-in-picture-off.svg",
"root-dir": "./custom-icons/cld/"
}, {
"name": "close",
"svg": "navigation/svg/production/ic_close_48px.svg"
}, {
"name": "facebook",
"svg": "facebook.svg",
"root-dir": "./custom-icons/fontawesome/"
}, {
"name": "gplus",
"svg": "gplus.svg",
"root-dir": "./custom-icons/fontawesome/"
}, {
"name": "linkedin",
"svg": "linkedin.svg",
Expand All @@ -110,11 +171,12 @@
"name": "audio-description",
"svg": "audio-description.svg",
"root-dir": "./custom-icons/"
}, {
"name": "audio",
"svg": "hardware/svg/production/ic_headset_48px.svg"
}, {
"name": "cart",
"svg": "action/svg/production/ic_shopping_cart_48px.svg"
}, {
"name": "check",
"svg": "check.svg",
"root-dir": "./custom-icons/cld/"
}]
}
Loading

0 comments on commit 15f2b48

Please sign in to comment.