resolve conflicts

kmoskwiak · Jul 9, 2016 · b928c07 · b928c07
2 parents 26bfcd6 + 033dfe2
commit b928c07
Show file tree

Hide file tree

Showing 3 changed files with 224 additions and 219 deletions.
diff --git a/examples/html5.html b/examples/html5.html
@@ -59,6 +59,7 @@
       width: 1000,
       plugins: {
         videoJsResolutionSwitcher: {
+          ui: true,
           default: 'low', // Default resolution [{Number}, 'low', 'high'],
           dynamicLabel: true // Display dynamic labels or gear symbol
         }

diff --git a/lib/videojs-resolution-switcher.css b/lib/videojs-resolution-switcher.css
@@ -1,8 +1,10 @@
-.vjs-resolution-button.vjs-menu-icon:before {
+.vjs-resolution-button .vjs-menu-icon:before {
   content: '\f110';
   font-family: VideoJS;
   font-weight: normal;
   font-style: normal;
+  font-size: 1.8em;
+  line-height: 1.67em;
 }
 
 .vjs-resolution-button .vjs-resolution-button-label {