Merge branch 'master' of https://github.com/kern/filepizza

css/index.styl

@@ -3,6 +3,7 @@ dark-gray = #333
 gray = #777
 green = #8FBE00
 light-blue = #40C0CB
+light-gray = #EEE
 light-green = #AEE239
 light-red = #E23430
 light-yellow = #FFE476
@@ -239,21 +240,23 @@ p.byline {
 }
 
 label.select-file-label input[type="file"] {
-    position: fixed;
+    position: fixed
-    top: -1000px;
+    top: -1000px
 }
 
 .select-file-label {
-    border: 2px solid #CCC;
+    border: 2px solid gray
-    border-radius: 4px;
+    border-radius: 4px
-    padding: 2px 5px;
+    padding: 2px 5px
-    margin-top: 5px;
+    margin-top: 5px
-    background: #EEE;
+    background: light-gray
-    display: inline-block;
+    display: inline-block
-}
+    cursor: pointer
-.select-file-label:hover {
+    transition: all 0.25s ease
-    background: #CCC;
+
-}
+    &:hover, &:active {
-.select-file-label:active {
+        border-color: beige
-    background: #BBB;
+        background: white
+        color: red
+    }
 }

lib/components/App.js

@@ -3,6 +3,10 @@ import FrozenHead from 'react-frozenhead'
 import React from 'react'
 import SupportStore from '../stores/SupportStore'
 import { RouteHandler } from 'react-router'
+import ga from 'react-google-analytics'
+
+ga('create', 'UA-62785624-1', 'auto');
+ga('send', 'pageview');
 
 export default class App extends React.Component {
 
@@ -33,8 +37,7 @@ export default class App extends React.Component {
         <meta property="og:image" content="http://file.pizza/images/fb.png" />
         <title>FilePizza - Send Files, Easily</title>
 
-        <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Quicksand:300,400,700" />
+        <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Quicksand:300,400,700|Lobster+Two" />
-        <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Lobster+Two" />
         <link rel="stylesheet" href="/css" />
 
         <script src="/js" />
@@ -47,6 +50,7 @@ export default class App extends React.Component {
           ? <RouteHandler />
           : <ErrorPage />}
         <script>FilePizza()</script>
+        <ga.Initializer />
       </body>
     </html>
   }

package.json

@@ -31,6 +31,7 @@
     "peer": "^0.2.8",
     "react": "^0.13.0",
     "react-frozenhead": "^0.3.0",
+    "react-google-analytics": "^0.2.0",
     "react-router": "^0.13.1",
     "socket.io": "^1.3.5",
     "stylus": "^0.50.0",