Merge branch 'master' of github.com:finalsclubdev/FinalsClub

[oweals/finalsclub.git] / public / index.html

diff --git a/public/index.html b/public/index.html
index 08ea68ee25fe8ff8a1e573128102c6a5c48b1d91..e8c607bf3d692369d9725dd088594adc9e909ea6 100755 (executable)
--- a/public/index.html
+++ b/public/index.html
@@ -6,7 +6,6 @@
                <link rel="stylesheet" href="/assets/css/include.css" type="text/css" media="screen" />
                <script type="text/javascript" src="/assets/js/modernizr.custom.js"></script>
                <script type="text/javascript" src="/assets/js/load.js"></script>
-
                <script type="text/javascript" src="http://use.typekit.com/cbx6gxx.js"></script>
                <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 
@@ -52,7 +51,6 @@
                <div id="messages" class="page"><span id="PROTO_message" class="__type__">__msg__</span></div>
                <div class="content">
 
-
                        <style>
                                /* The is here is because it's related less to "styling" and more to UI "behavior" */
                                .page { display: none; }
@@ -106,7 +104,7 @@
                                        <div class="grid-6">
                                                <h3 class="heading">Check out our Screencasts</h3>
                                                <div class="video-wrapper">
-                                                                       </div>
+                                                       <iframe src="http://player.vimeo.com/video/30647271?title=0&amp;byline=0&amp;portrait=0&amp;color=367da9" width="460" height="259" frameborder="0" webkitAllowFullScreen allowFullScreen></iframe>              </div>
                                                </div>
                                        <div class="grid-6">
                                                <h3 class="heading">We currently support the following schools</h3>
@@ -688,11 +686,11 @@
                                <div class="grid-12">
                                        <nav id="footer-nav">
                                                <ul>
-                                                       <li><a href="#">Code of Conduct</a></li>
-                                                       <li><a href="#">About</a></li>
-                                                       <li><a href="#">Contact</a></li>
-                                                       <li><a href="#">Legal</a></li>
-                                                       <li><a href="#">Team</a></li>
+                                                       <li><a href="/conduct">Code of Conduct</a></li>
+                                                       <li><a href="http://blog.finalsclub.org/about.html">About</a></li>
+                                                       <li><a href="http://blog.finalsclub.org/contact.html">Contact</a></li>
+                                                       <li><a href="http://blog.finalsclub.org/legal.html">Legal</a></li>
+                                                       <li><a href="http://blog.finalsclub.org/team.html">Team</a></li>
                                                </ul>
                                        </nav>
                                        <p>Copyright 2011 Finals Club.  All rights reserved.</p>