Merged hartman-css into master

This commit is contained in:
Kasper Moskwiak 2016-07-08 19:17:53 +02:00
commit 26bfcd6dbd
2 changed files with 35 additions and 45 deletions

View file

@ -1,12 +1,8 @@
.vjs-resolution-button {
color: #ccc;
font-family: VideoJS;
}
.vjs-resolution-button .vjs-resolution-button-staticlabel:before {
.vjs-resolution-button.vjs-menu-icon:before {
content: '\f110';
font-size: 1.8em;
line-height: 1.67;
font-family: VideoJS;
font-weight: normal;
font-style: normal;
}
.vjs-resolution-button .vjs-resolution-button-label {
@ -19,19 +15,15 @@
height: 100%;
text-align: center;
box-sizing: inherit;
font-family: Arial, Helvetica, sans-serif;
}
.vjs-resolution-button ul.vjs-menu-content {
width: 4em !important;
}
.vjs-resolution-button .vjs-menu {
left: 0;
.vjs-resolution-button .vjs-menu .vjs-menu-content {
width: 4em;
left: 50%; /* Center the menu, in it's parent */
margin-left: -2em; /* half of width, to center */
}
.vjs-resolution-button .vjs-menu li {
text-transform: none;
font-size: 1em;
font-family: Arial, Helvetica, sans-serif;
}

View file

@ -117,10 +117,8 @@
if(settings.dynamicLabel){
this.el().appendChild(label);
}else{
var staticLabel = document.createElement('span');
videojs.addClass(staticLabel, 'vjs-resolution-button-staticlabel');
this.el().appendChild(staticLabel);
} else {
videojs.addClass(this.el(), 'vjs-menu-icon');
}
},
createItems: function(){