Added a cog icon to the font icons. closes #1211

videojs · May 19, 2014 · 6bb9228 · 6bb9228
1 parent f3ab261
commit 6bb9228
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 125 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ CHANGELOG
 * Added cross-browser testing with SauceLabs, and added Karma as the default test runner ([view](https://github.com/videojs/video.js/pull/1187))
 * Fixed saucelabs integration to run on commits in TravisCI ([view](https://github.com/videojs/video.js/pull/1214))
 * Added a clearer error message when a tech is undefined ([view](https://github.com/videojs/video.js/pull/1210))
+* Added a cog icon to the font icons ([view](https://github.com/videojs/video.js/pull/1211))
 
 --------------------
 

diff --git a/src/css/font/vjs.eot b/src/css/font/vjs.eot
diff --git a/src/css/font/vjs.svg b/src/css/font/vjs.svg
diff --git a/src/css/font/vjs.ttf b/src/css/font/vjs.ttf
diff --git a/src/css/font/vjs.woff b/src/css/font/vjs.woff
diff --git a/src/css/video-js.font.dev.svg b/src/css/video-js.font.dev.svg
diff --git a/src/css/video-js.fw.png b/src/css/video-js.fw.png
diff --git a/src/css/video-js.less b/src/css/video-js.less
@@ -101,6 +101,7 @@ The control icons are from a custom font. Each icon corresponds to a character
 @subtitles-icon: "\e00c";
 @captions-icon: "\e008";
 @share-icon: "\e00e";
+@cog-icon: "\e600";
 
 /* Base UI Component Classes
 --------------------------------------------------------------------------------

diff --git a/src/css/video-js.png b/src/css/video-js.png