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.

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

Move captions down when controls are inactive #1053

Merged
merged 2 commits into from
Mar 3, 2014
Merged

Conversation

harhoo
Copy link
Contributor

@harhoo harhoo commented Mar 3, 2014

Pull request based on #1049 - moving captions towards bottom of video when controls are inactive.

@@ -770,6 +770,8 @@ body.vjs-full-window {
left: 1em;
right: 1em;
}
/* Move captions down when controls aren't being shown */
.video-js.vjs-user-inactive .vjs-text-track-display { bottom: 1em; }
Copy link
Member

Choose a reason for hiding this comment

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

There should be more whitespace around here to make it look like the rest of the code.

@heff heff merged commit 3e19d76 into videojs:master Mar 3, 2014
@heff
Copy link
Member

heff commented Mar 3, 2014

Nicely done, thanks!

@heff
Copy link
Member

heff commented Mar 3, 2014

FYI, just added .vjs-playing also, otherwise the captions drop behind the controls when the video is paused.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants