Commit ea15955c authored by Bady's avatar Bady
Browse files

Merge branch 'master' into 'master'

diaspora introduction video

See merge request !8
parents 1db8378d 22a28f97
This diff is collapsed.
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<link rel="stylesheet" href="css/style.css"> <link rel="stylesheet" href="css/style.css">
<link rel="stylesheet" href="css/progress-bar.css"> <link rel="stylesheet" href="css/progress-bar.css">
<link rel="stylesheet" href="css/video-js.min.css">
<!-- to be added opengraph WIP --> <!-- to be added opengraph WIP -->
</head> </head>
...@@ -206,7 +207,21 @@ ...@@ -206,7 +207,21 @@
<div class="wow fadeInUp col-md-6 col-sm-10 video" data-wow-delay="1.6s"> <div class="wow fadeInUp col-md-6 col-sm-10 video" data-wow-delay="1.6s">
<div class="img img-responsive"> <div class="img img-responsive">
<a href=""><img class="img img-responsive" src="images/watch.png"></a> <!--
<a href=""><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='' type='video/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>
</div> </div>
</div> </div>
...@@ -451,6 +466,8 @@ ...@@ -451,6 +466,8 @@
<script src="js/smoothscroll.js"></script> <script src="js/smoothscroll.js"></script>
<script src="js/wow.min.js"></script> <script src="js/wow.min.js"></script>
<script src='js/video.min.js'></script>
<!-- Custom JS --> <!-- Custom JS -->
<script src="js/custom.js"></script> <script src="js/custom.js"></script>
<script src="js/progress-bar.js"></script> <script src="js/progress-bar.js"></script>
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment