From 14d36a47ee3240e4d474bf85d63c601824e47002 Mon Sep 17 00:00:00 2001 From: Vadim Sikora Date: Mon, 8 Aug 2016 18:18:50 -0400 Subject: [PATCH 1/2] @vxsx fixed legend selector to be more specific. Fixes #3492. Closes #3494 --- CHANGELOG.md | 2 +- src/css/components/_captions-settings.scss | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc8bc80c9..f208f2874 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ CHANGELOG ========= ## HEAD (Unreleased) -_(none)_ +* @vxsx fixed legend selector to be more specific. Fixes #3492 ([view](https://github.com/videojs/video.js/pull/3494)) -------------------- diff --git a/src/css/components/_captions-settings.scss b/src/css/components/_captions-settings.scss index 19ce783f1..a1d471f04 100644 --- a/src/css/components/_captions-settings.scss +++ b/src/css/components/_captions-settings.scss @@ -42,7 +42,8 @@ min-height: 40px; border: none; } -.vjs-caption-settings .vjs-tracksetting label, legend { +.vjs-caption-settings .vjs-tracksetting label, +.vjs-caption-settings .vjs-tracksetting legend { display: block; width: 100px; margin-bottom: 5px; From 876d1128a660ce195575dcc2a6adb18cfbee368c Mon Sep 17 00:00:00 2001 From: Gary Katsevman Date: Mon, 8 Aug 2016 18:21:15 -0400 Subject: [PATCH 2/2] v5.11.1 --- CHANGELOG.md | 5 ++++- component.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f208f2874..ebdcf2d2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,13 @@ CHANGELOG ========= ## HEAD (Unreleased) -* @vxsx fixed legend selector to be more specific. Fixes #3492 ([view](https://github.com/videojs/video.js/pull/3494)) +_(none)_ -------------------- +## 5.11.1 (2016-08-08) +* @vxsx fixed legend selector to be more specific. Fixes #3492 ([view](https://github.com/videojs/video.js/pull/3494)) + ## 5.11.0 (2016-07-22) * @BrandonOCasey Document audio/video track usage ([view](https://github.com/videojs/video.js/pull/3295)) * @hartman Correct documentation to refer to nativeTextTracks option ([view](https://github.com/videojs/video.js/pull/3309)) diff --git a/component.json b/component.json index e35fa3a86..4ffb3d34a 100644 --- a/component.json +++ b/component.json @@ -1,7 +1,7 @@ { "name": "video.js", "description": "An HTML5 and Flash video player with a common API and skin for both.", - "version": "5.11.0", + "version": "5.11.1", "keywords": [ "videojs", "html5", diff --git a/package.json b/package.json index 892c4090c..32cc5d369 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "video.js", "description": "An HTML5 and Flash video player with a common API and skin for both.", - "version": "5.11.0", + "version": "5.11.1", "copyright": "Copyright Brightcove, Inc. ", "license": "Apache-2.0", "keywords": [