Merge branch 'master' of https://github.com/g-palmer/hashtags

banjolina-jolie · Jul 15, 2013 · 5a0d58c · 5a0d58c
2 parents 3cbad7d + 2c8936e
commit 5a0d58c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hashtags",
-  "version": "0.0.1-19",
+  "version": "0.0.1-20",
   "private": true,
   "scripts": {
     "start": "node app.js"

diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
@@ -1,4 +1,11 @@
+* {
+    max-width: 600px;
+}
+
 html, body {
+
+  margin-left: auto;
+  margin-right: auto;
   height: 100%;
   background-color: #f7b4d2;
 }
@@ -170,6 +177,12 @@ h4 {
   -webkit-box-shadow: rgba(0,0,0,0.4) 3px 3px;
 }
 
+@media (min-width: 800px) {
+  .fixed{
+    position: absolute;
+  }
+}
+
 .newGame {
   margin: 1em 0;
 }