Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw

4 years ago · 795aab1435
3 changed files with 16 additions and 6 deletions
--- a/static/audio/turkish_march.ogg
+++ b/static/audio/turkish_march.ogg
--- a/static/css/style.css
+++ b/static/css/style.css
@ -1,6 +1,3 @@
 /* * {
  background-color: red;
 } */
 #video1 {
  padding-top: 100px;
@ -8,4 +5,11 @@
 .draggable img {
  opacity: 0.7;
 #video2 {
  padding-top: 100px;
  position: relative;
 }
 #audio1 {
  margin-left: 400px;
 }
--- a/templates/perspectiveA.html
+++ b/templates/perspectiveA.html
@ -1,14 +1,20 @@
 <!doctype html>
 <html>
 <head>
  <link rel="stylesheet" href="../static/css/style.css">
  <title>Perspective A</title>
 </head>
 <body>
  <h1>Perspective A</h1>
  <div id="audio1">
    <audio controls src="../static/audio/turkish_march.ogg" type="audio/ogg"></audio>
  </div>
  <div id="video1">
-  <iframe width="420" height="315"
+  <iframe width="420" height="281" src="https://www.youtube.com/embed/fKOKxuFyEdg" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-src="https://www.youtube.com/watch?v=fKOKxuFyEdg">
+</div>
-</iframe>
+<div id="video2">
 <iframe width="340" height="250" src="https://www.youtube.com/embed/5_9PAugYb4s" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 </div>
 </body>
 </html>