Merge branch 'master' into 'master'

diaspora introduction video

See merge request !8

index.html

@@ -18,6 +18,7 @@
   <link rel="stylesheet" href="css/style.css">
   <link rel="stylesheet" href="css/progress-bar.css">
 
+ <link rel="stylesheet" href="css/video-js.min.css">
  
 <!-- to be added opengraph WIP -->
 </head>
@@ -206,7 +207,21 @@
 
         <div class="wow fadeInUp col-md-6 col-sm-10 video" data-wow-delay="1.6s">
           <div class="img img-responsive">
-            <a href="https://www.youtube.com/embed/7Rr-FVe14Yo"><img class="img img-responsive" src="images/watch.png"></a>
+<!--
+            <a href="https://www.youtube.com/embed/7Rr-FVe14Yo"><img class="img img-responsive" src="images/watch.png"></a> -->
+
+
+  <video id='my-video' class='video-js' controls preload='auto' width='560' height='314'
+  poster='images/Diaspora_dandy_logo_thumbnail.png' data-setup='{}'>
+    <source src='https://peertube.social/download/videos/6133bfc6-ed5b-4f47-b21c-c6f26c500851-314.mp4' type='video/mp4'>
+    
+<!-- https://ksr-video.imgix.net/projects/5057/video-4215-h264_high.mp4 -->
+
+    <p class='vjs-no-js'>
+      To view this video please enable JavaScript, and consider upgrading to a web browser that
+      <a href='#' target='_blank'>supports HTML5 video</a>
+    </p>
+  </video>
           </div>
         </div>
 
@@ -451,6 +466,8 @@
   <script src="js/smoothscroll.js"></script>
   <script src="js/wow.min.js"></script>
 
+<script src='js/video.min.js'></script>
+
   <!-- Custom JS -->
   <script src="js/custom.js"></script>
   <script src="js/progress-bar.js"></script>