Update LICENSE, minor formatting tweaks.

unhaltable · Feb 26, 2015 · 207ebde · 207ebde
1 parent 0aa3b88
commit 207ebde
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 18 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1 @@
+This work is licensed under a [Creative Commons Attribution-NonCommercial 4.0 International License](http://creativecommons.org/licenses/by-nc/4.0/).
diff --git a/countdown/index.html b/countdown/index.html
@@ -4,18 +4,20 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
   <meta http-equiv="X-UA-Compatible" content="chrome=1">
+
   <title>Jon &amp; Nick</title>
-  <meta property="og:url" content="http://www.jonandnick.com/">
+
+  <meta property="og:url" content="http://echeung.me/jonandnick/">
   <meta property="og:title" content="Jon and Nick">
-  <meta property="og:image" content="http://www.jonandnick.com/img/favicon.png">
+  <meta property="og:image" content="http://echeung.me/jonandnick/img/favicon.png">
   <meta property="og:type" content="profile">
+
   <link rel="stylesheet" href="css/style.min.css">
   <link rel="icon" type="image/png" href="img/favicon.png">
+
   <!--[if lt IE 9]>
     <script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js"></script>
   <![endif]-->
-  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-  <script src="js/script.min.js"></script>
 </head>
 <body>
   <div id="container">
@@ -27,6 +29,9 @@
       <div><div id="ms"></div>ms</div>
     </section>
   </div>
+
+  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+  <script src="js/script.min.js"></script>
   <script>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -37,4 +42,4 @@
     ga('send', 'pageview');
   </script>
 </body>
-</html>
+</html>
diff --git a/img/80x15.png b/img/80x15.png
diff --git a/index.html b/index.html
@@ -4,20 +4,21 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
   <meta http-equiv="X-UA-Compatible" content="chrome=1">
+
   <title>Vote for Jon &amp; Nick</title>
-  <meta property="og:url" content="http://jonandnick.com/">
+
+  <meta property="og:url" content="http://echeung.me/jonandnick/">
   <meta property="og:title" content="Vote Jon and Nick for CSSU 2014">
-  <meta property="og:image" content="http://jonandnick.com/img/favicon.png">
+  <meta property="og:image" content="http://echeung.me/jonandnick/img/favicon.png">
   <meta property="og:description" content="Vote Jonathan Webb and Nicholas Goh for your CSSU president and vice-president!">
   <meta property="og:type" content="profile">
+
   <link rel="stylesheet" href="css/style.min.css">
   <link rel="icon" type="image/png" href="img/favicon.png">
+
   <!--[if lt IE 9]>
     <script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js"></script>
   <![endif]-->
-  <script src="http://maps.google.com/maps/api/js?v=3&amp;sensor=false"></script>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/script.min.js"></script>
 </head>
 <body>
   <header>
@@ -30,8 +31,10 @@
       </div>
     </div>
   </header>
+
   <section id="content">
     <span id="more">v</span>
+
     <nav id="nav">
       <div class="maxcontainer">
         <div id="navleft">
@@ -48,6 +51,7 @@
         </div>
       </div>
     </nav>
+
     <section id="about">
       <div class="maxcontainer">
         <h1>About us</h1>
@@ -74,6 +78,7 @@ <h3>for CSSU Vice-President</h3>
         </div>
       </div>
     </section>
+
     <section id="goals">
       <div class="maxcontainer">
         <h1>Our goals</h1>
@@ -105,6 +110,7 @@ <h1>Our goals</h1>
         </section>
       </div>
     </section>
+
     <section id="vote">
       <div id="map">
         <h1>Vote for us</h1>
@@ -120,24 +126,32 @@ <h1>Vote for us</h1>
         <div id="gmap_canvas"></div>
       </div>
     </section>
+
     <section id="contact">
       <h1>Contact</h1>
       <a href="https://twitter.com/jwebbed" target="_blank" title="@jwebbed on Twitter" class="button">Follow Jon</a>
       <a href="https://twitter.com/NickGoh_" target="_blank" title="@NickGoh_ on Twitter" class="button">Follow Nick</a>
     </section>
+
     <footer>
       <div class="maxcontainer">
-        <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/" id="ccimg">
+        <a rel="license" href="http://creativecommons.org/licenses/by-nc/4.0/" id="ccimg">
           <img alt="Creative Commons License" style="border-width:0" src="img/80x15.png">
         </a>
-        <p id="cc">This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License</a>.</p>
-        <p><a href="http://cssu.cdf.toronto.edu/">UofT CSSU official website</a>, <a href="https://www.facebook.com/events/403396886464062/">CSSU Elections + Voting Facebook event</a></p>
+        <p id="cc">This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc/4.0/">Creative Commons Attribution-NonCommercial 4.0 International License</a>.</p>
+
+        <p><a href="https://cssu.ca/">UofT CSSU official website</a>, <a href="https://www.facebook.com/events/403396886464062/">CSSU Elections + Voting Facebook event</a></p>
+
         <p>Special thanks to <a href="https://twitter.com/spe_">Spencer Elliott</a>, <a href="https://twitter.com/ryanscfan">Ryan Fan</a>, and <a href="https://twitter.com/aeolianesque">Victoria Bigliardi</a>.</p>
         <p>Photos of Jonathan by <a href="http://www.liaodette.tumblr.com/">Lia Odette</a>.</p>
         <p>Website by <a href="http://echeung.me">Eugene Cheung</a>.</p>
       </div>
     </footer>
   </section>
+
+  <script src="http://maps.google.com/maps/api/js?v=3&amp;sensor=false"></script>
+  <script src="js/jquery.min.js"></script>
+  <script src="js/script.min.js"></script>
   <script>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -148,4 +162,4 @@ <h1>Contact</h1>
     ga('send', 'pageview');
   </script>
 </body>
-</html>
+</html>
diff --git a/votenow/index.html b/votenow/index.html
@@ -4,21 +4,25 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
   <meta http-equiv="X-UA-Compatible" content="chrome=1">
+
   <title>CSSU Elections are today!</title>
+
   <link rel="stylesheet" href="css/style.min.css">
   <link rel="icon" type="image/png" href="img/favicon.png">
   <!--[if lt IE 9]>
     <script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js"></script>
   <![endif]-->
-  <script src="http://maps.google.com/maps/api/js?v=3&amp;sensor=false"></script>
-  <script src="js/jquery.min.js"></script>
-  <script src="js/script.min.js"></script>
 </head>
 <body>
   <div id="map">
     <div id="gmap_canvas"></div>
   </div>
+
   <p>Help shape next year's CSSU today at the CSSU office (BA 2283).</p>
+
+  <script src="http://maps.google.com/maps/api/js?v=3&amp;sensor=false"></script>
+  <script src="js/jquery.min.js"></script>
+  <script src="js/script.min.js"></script>
   <script>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -29,4 +33,4 @@
     ga('send', 'pageview');
   </script>
 </body>
-</html>
+</html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This work is licensed under a [Creative Commons Attribution-NonCommercial 4.0 International License](http://creativecommons.org/licenses/by-nc/4.0/).