summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKawandeep Virdee2013-11-10 13:23:53 -0500
committerKawandeep Virdee2013-11-10 13:23:53 -0500
commit10d16f0e81951930bbc5f4613d9c65fa7660b935 (patch)
tree3f49c2d7f3b1fc261c89c40cd6159f4a11a3c64a
parent0a6657514058935251366c770bfd85a419f60786 (diff)
parent5f0312541fca6dbd957c65d22386da5278c3fcab (diff)
downloadclip-play-10d16f0e81951930bbc5f4613d9c65fa7660b935.tar.bz2
Merge branch 'master' of github.com:whichlight/clip-play
-rw-r--r--assets/css/application.css23
-rw-r--r--index.html6
2 files changed, 28 insertions, 1 deletions
diff --git a/assets/css/application.css b/assets/css/application.css
index c3dba05..0aba747 100644
--- a/assets/css/application.css
+++ b/assets/css/application.css
@@ -22,6 +22,29 @@ header {
}
+footer {
+ position: absolute;
+ bottom: 1em;
+ font-size: 13px;
+ font-family: 'Lucida Grande', Helvetica, sans-serif;
+}
+
+
+
+/* . Links . */
+a {
+ color: #2f8dae;
+}
+
+a:hover {
+ color: #2a7d9a;
+}
+
+a:active {
+ color: #246c86;
+}
+
+
/* . Inputs . */
.url-input {
diff --git a/index.html b/index.html
index 8573c4c..0b19b20 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta charset="utf-8">
<meta http-equiv="cache-control" content="no-cache" />
- <title></title>
+ <title>ClipPlay - Sample Online Media and Jam</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
@@ -32,6 +32,10 @@
<div id="video"></div>
</div>
+
+ <footer>
+ Made by <a href="https://github.com/whichlight/">Kawandeep Virdee</a> &amp; <a href="https://github.com/teddywing">Teddy Wing</a> at <a href="http://boston.musichackday.org/">Music Hack Day Boston 2013</a>
+ </footer>
<script src="/assets/js/libs/jquery-2.0.3.min.js"></script>