Merge branch 'master' of https://github.com/thecookiefactory/duchess

Conflicts: duchess/templates/index.html
thecookiefactory · Apr 12, 2014 · 5527b94 · 5527b94
2 parents 9bcd714 + cb4199b
commit 5527b94
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/duchess/templates/index.html b/duchess/templates/index.html
@@ -8,17 +8,17 @@
   </head>
   <body>
     <section class='hero'>
-      <video class='background' loop autoplay style='opacity: 0;'>
-        <source src='{{ url_for('static', filename='media/background.webm') }}' type='video/webm'>
-      </video>
-      <video class='intro' autopreload>
-        <source src='{{ url_for('static', filename='media/thecookiefactory-logo.webm') }}' type='video/webm'>
-      </video>
       <h1>Duchess</h1>
       <div class='buttons'>
         <button class='start' type='button'>Start</button><br>
         <a class='load' href='#'>(or load a saved game)</a>
       </div>
+      <video class='background' loop autoplay style='opacity: 0;'>
+        <source src='{{ url_for('static', filename='media/background.webm') }}' type='video/webm'>
+      </video>
+      <video class='intro' preload='auto'>
+        <source src='{{ url_for('static', filename='media/thecookiefactory-logo.webm') }}' type='video/webm'>
+      </video>
     </section>
     <section class='about'>
     <h2>About</h2>