Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php

src/frontend/web/css/main.css

@@ -922,8 +922,51 @@ a,a:hover,a:link {
 .has-icon-part span.icon-play {
     font-size: 48px;
 }
+
+
+/*videojs reset*/
 .vjs-big-play-centered .vjs-big-play-button {
     z-index: 2!important;
 }
+.video-js .vjs-mute-control, .video-js .vjs-volume-menu-button, .vjs-icon-volume-high {
+    font-size: 12px;
+}
+.video-js .vjs-big-play-button, .video-js .vjs-play-control, .vjs-icon-play {
+    font-size: 13px;
+}
+.video-js .vjs-fullscreen-control {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+}
+.video-js .vjs-control-bar {
+    background-color: transparent!important;
+    bottom: 6px!important;
+}
+.video-js .vjs-progress-control {
+    position: absolute!important;
+    width: 100%!important;
+    left: 0!important;
+    bottom: 26px!important;
+}
+.vjs-fullscreen-control {
+    position: absolute!important;
+    right: 0!important;
+    bottom: 0!important;
+}
+.vjs-icon-fullscreen-enter, .video-js .vjs-fullscreen-control {
+    font-size: 12px;
+}
+.vjs-remaining-time {
+    position: absolute!important;
+    right: 50px;
+}
+.video-js .vjs-play-progress {
+    background-color: #f12b24!important;
+}
+.video-js .vjs-load-progress {
+
+}
+