12 commits

Author	SHA1	Message	Date
Kasper Moskwiak	b928c07378	resolve conflicts	2016-07-09 18:55:24 +02:00
Kasper Moskwiak	a8703b16e7	keep font-family when .vjs-menu-icon is applied	2016-07-08 19:05:32 +02:00
Derk-Jan Hartman	c1a41a4635	Cleanup styling ... - Remove color override - Simplify how the dynamic label vs cog icon is styled - Don't use !important, but specificity to override video.js - Use more isolated method to center the menu.	2016-04-23 17:43:25 +02:00
Derk-Jan Hartman	dc3383cc48	Fix indentation	2016-04-23 15:34:06 +02:00
Kasper Moskwiak	e02c1cd8b2	use sans-serif fonts	2016-03-13 21:12:35 +01:00
Kasper Moskwiak	b964dd0c0f	Merge branch 'feature/disable-text-transform-for-resolution-menu' of git://github.com/gkralik/videojs-resolution-switcher into gkralik-feature/disable-text-transform-for-resolution-menu	2016-02-06 11:39:37 +01:00
Gregor Kralik	8f6511f1e4	make sure the resolution select button's text is vertically centered ... decrease the line-height from 2.5em to 2.3em	2016-01-27 14:45:14 +01:00
Gregor Kralik	365238ba45	disable the text-transform CSS property for the resolution menu ... the default skin has text-transform: lowercase. so if one uses "HD" and "SD" as resolution labels, it will render as "hd" and "sd" by default. override the property so no transformation occurs and the labels show as the user wants them to show.	2016-01-27 13:42:55 +01:00
Kasper Moskwiak	baf3f1340e	update videojs to 5.0.0-rc.90	2015-09-16 18:59:33 +02:00
Kasper Moskwiak	b120a90942	dynamic label	2015-08-20 17:57:31 +02:00
Kasper Moskwiak	38436a4f93	videojs rc52 update	2015-08-18 18:42:16 +02:00
Kasper Moskwiak	940c95ae67	init	2015-07-27 18:12:42 +02:00