Skip to content

Commit

Permalink
adding back caption-settings styles. Closes videojs#2104
Browse files Browse the repository at this point in the history
  • Loading branch information
mmcc authored and gkatsev committed May 1, 2015
1 parent 0b8bcbf commit 77755f1
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/css/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $primary-bg: #000;
$secondary-bg: lighten($primary-bg, 35%);

$icon-font-family: 'VideoJS';
$text-font-family: Arial, sans-serif;
$text-font-family: Arial, Helvetica, sans-serif;
$base-font-size: 10px;

$control-bar-bg: #2B333F;
Expand Down
74 changes: 74 additions & 0 deletions src/css/components/_captions-settings.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
.vjs-caption-settings {
position: relative;
top: 1em;
background-color: $primary-bg;
opacity: 0.75;
color: $primary-text;
margin: 0 auto;
padding: 0.5em;
height: 15em;
font-family: $text-font-family;
font-size: 12px;
width: 40em;
}

.vjs-caption-settings .vjs-tracksettings {
top: 0;
bottom: 2em;
left: 0;
right: 0;
position: absolute;
overflow: auto;
}

.vjs-caption-settings .vjs-tracksettings-colors,
.vjs-caption-settings .vjs-tracksettings-font {
float: left;
}
.vjs-caption-settings .vjs-tracksettings-colors:after,
.vjs-caption-settings .vjs-tracksettings-font:after,
.vjs-caption-settings .vjs-tracksettings-controls:after {
clear: both;
}

.vjs-caption-settings .vjs-tracksettings-controls {
position: absolute;
bottom: 1em;
right: 1em;
}

.vjs-caption-settings .vjs-tracksetting {
margin: 5px;
padding: 3px;
min-height: 40px;
}
.vjs-caption-settings .vjs-tracksetting label {
display: block;
width: 100px;
margin-bottom: 5px;
}

.vjs-caption-settings .vjs-tracksetting span {
display: inline;
margin-left: 5px;
}

.vjs-caption-settings .vjs-tracksetting > div {
margin-bottom: 5px;
min-height: 20px;
}

.vjs-caption-settings .vjs-tracksetting > div:last-child {
margin-bottom: 0;
padding-bottom: 0;
min-height: 0;
}

.vjs-caption-settings label > input {
margin-right: 10px;
}

.vjs-caption-settings input[type="button"] {
width: 40px;
height: 40px;
}
1 change: 1 addition & 0 deletions src/css/video-js.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@
@import "components/chapters";
@import "components/subtitles";
@import "components/adaptive";
@import "components/captions-settings";

0 comments on commit 77755f1

Please sign in to comment.