fixed error on condition and also changed px to ems
Merge branch 'v4beta' of github.com:Eonasdan/bootstrap-datetimepicker into v4beta
added fix for #483 on v4branch as well