Merge remote-tracking branch 'origin/master'

Peer5 · Feb 28, 2013 · 287450e · 287450e
2 parents 47c6b72 + ee1952d
commit 287450e
Show file tree

Hide file tree

Showing 11 changed files with 340 additions and 233 deletions.
diff --git a/README.md b/README.md
@@ -22,6 +22,8 @@ test it out at: http://sharefest.peer5.com
 TODO:
 =====
 * local storage
+* RESTful API
+* tests
 * see issues - https://github.com/Peer5/ShareFest/issues
 
 History

diff --git a/public/browser.html b/public/browser.html
@@ -4,53 +4,8 @@
     <title>Sharefest</title>
     <!-- Bootstrap -->
     <link href="css/bootstrap.min.css" rel="stylesheet">
+    <link href="css/main.css" rel="stylesheet">
     <link href='http://fonts.googleapis.com/css?family=Courgette' rel='stylesheet' type='text/css'>
-
-    <style>
-        body {
-            padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
-            font-family: "Courgette";
-        }
-
-        .text-pretty {
-            font-size: 1.5em;
-        }
-
-        h3 {
-            font-size: 24px;
-        }
-
-        h1 {
-            font-family: 'Courgette', 'IM Fell English', serif;
-            font-size: 5em;
-        }
-
-        .dragdrop {
-            padding-top: 260px;
-            width: 900px;
-            height: 400px;
-            border: solid #000000;
-            line-height: 50px;
-            text-align: center;
-            font-weight: bold;
-            background-color: #FFFFFF;
-            opacity: 0.8;
-
-        }
-
-        .bg {
-            background-image: url('img/1.jpg');
-        }
-
-        .info {
-            right: 10px;
-            float: right;
-            clear: both;
-            bottom: 10px;
-            position: absolute;
-        }
-
-    </style>
 </head>
 <body class="bg">
 <a href="https://github.com/peer5/sharefest"><img style="position: absolute; top: 0; right: 0; border: 0; z-index:9999"
@@ -84,7 +39,9 @@ <h1></h1>
     <div class="dragdrop text-pretty" id="dropbox" onClick="$('#files').click()">
         <canvas id="cnvs" style="height: 0px"></canvas>
         <div><img id="logo" src="img/logo.png"/>
-            <br/>
+
+            <br>
+            <br>
             <p id='box-text'>Sorry! Your browser isn't supported yet.</p>
                 <p>Please use Chrome Canary or Firefox Nightly to try out Sharefest.</p>
             <p>

diff --git a/public/css/main.css b/public/css/main.css
@@ -0,0 +1,49 @@
+body {
+    padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
+    font-family: "Courgette";
+}
+
+.text-pretty {
+    font-size: 1.5em;
+}
+
+h3 {
+    font-size: 24px;
+}
+
+h1 {
+    font-family: 'Courgette', 'IM Fell English', serif;
+    font-size: 5em;
+}
+
+.dragdrop {
+    padding-top: 260px;
+    width: 900px;
+    height: 400px;
+    border: solid #000000;
+    line-height: 30px;
+    text-align: center;
+    font-weight: bold;
+    background-color: #FFFFFF;
+    opacity: 0.8;
+
+}
+
+.bg {
+    background-image: url('../img/1.jpg');
+}
+
+.info {
+    right: 10px;
+    float: right;
+    clear: both;
+    bottom: 10px;
+    position: absolute;
+}
+
+#countWrapper {
+    font-size: 0.8em;
+    /*position: absolute;*/
+    /*left: 58px;*/
+    /*top: 705px;*/
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,8 @@ test it out at: http://sharefest.peer5.com @@
     TODO:
     =====
     * local storage
+    * RESTful API
+    * tests
     * see issues - https://github.com/Peer5/ShareFest/issues
     History
@@ Expand Down @@