From 4175ef1ca74126b4b4f1150aebcb1ee216fac798 Mon Sep 17 00:00:00 2001
From: karolinaszczur <me@karolinaszczur.com>
Date: Wed, 23 Oct 2013 14:16:27 +0200
Subject: [PATCH] [ux] unify text inputs

---
 clientapp/templates.js              |  2 +-
 clientapp/templates/pages/main.jade |  2 +-
 public/css/app/forms.styl           |  4 ++--
 public/css/app/settings.styl        |  9 +++------
 public/css/otalk.css                | 20 +++++++-------------
 public/x-manifest.cache             |  2 +-
 6 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/clientapp/templates.js b/clientapp/templates.js
index a60ba21..68a5173 100644
--- a/clientapp/templates.js
+++ b/clientapp/templates.js
@@ -196,7 +196,7 @@ exports.pages.groupchat = function anonymous(locals) {
 exports.pages.main = function anonymous(locals) {
     var buf = [];
     with (locals || {}) {
-        buf.push('<section class="page main"><div><h3>Current status</h3><div contenteditable="true" class="status"></div></div><div id="avatarChanger"><h3>Change Avatar</h3><div class="uploadRegion"><p>Drag and drop a new avatar here</p><img/><form><input id="uploader" type="file"/></form></div></div><div><h3>Add / Approve Contacts</h3><input id="addcontact"/><button class="addContact">Add</button><ul id="contactrequests"></ul></div><div><h3>Desktop Integration</h3><button class="enableAlerts">Enable alerts</button><button class="installFirefox">Install app</button></div></section>');
+        buf.push('<section class="page main"><div><h3>Current status</h3><div contenteditable="true" class="status"></div></div><div id="avatarChanger"><h3>Change Avatar</h3><div class="uploadRegion"><p>Drag and drop a new avatar here</p><img/><form><input id="uploader" type="file"/></form></div></div><div><h3>Add / Approve Contacts</h3><input type="text" id="addcontact"/><button class="addContact">Add</button><ul id="contactrequests"></ul></div><div><h3>Desktop Integration</h3><button class="enableAlerts">Enable alerts</button><button class="installFirefox">Install app</button></div></section>');
     }
     return buf.join("");
 };
diff --git a/clientapp/templates/pages/main.jade b/clientapp/templates/pages/main.jade
index 1516938..e9c9497 100644
--- a/clientapp/templates/pages/main.jade
+++ b/clientapp/templates/pages/main.jade
@@ -14,7 +14,7 @@ section.page.main
 
   div
     h3 Add / Approve Contacts
-    input#addcontact
+    input(type="text")#addcontact
     button.addContact Add
     ul#contactrequests
 
diff --git a/public/css/app/forms.styl b/public/css/app/forms.styl
index 57c411a..9dd1471 100644
--- a/public/css/app/forms.styl
+++ b/public/css/app/forms.styl
@@ -1,6 +1,6 @@
 // Forms and Buttons
 
-input[type=text], input[type=email], input[type=search], input[type=password], textarea
+input[type=text], input[type=email], input[type=search], input[type=password], textarea, .main .status
   -webkit-appearance: none
   roundall(3px)
   padding: 0 10px
@@ -17,7 +17,7 @@ input[type=text], input[type=email], input[type=search], input[type=password], t
   -webkit-transition: border .2s ease-in 0
   -moz-transition: border .2s ease-in 0
 
-input[type=text], input[type=email], input[type=search], input[type=password]
+input[type=text], input[type=email], input[type=search], input[type=password], .main .status
   height: 35px
 
 textarea
diff --git a/public/css/app/settings.styl b/public/css/app/settings.styl
index 37da7e2..362c24f 100644
--- a/public/css/app/settings.styl
+++ b/public/css/app/settings.styl
@@ -5,15 +5,12 @@
   padding: 20px
   border-bottom: 1px solid $grayOutline
 
+  .status
+    padding: 10px
+
   &:last-of-type
     border: none
 
-  .status
-    padding: 5px
-    background: $grayBackground
-    roundall(3px)
-    font-size: $fontSmall
-
 .uploadRegion
   padding: 15px
   font-size: $fontSmall
diff --git a/public/css/otalk.css b/public/css/otalk.css
index a06424a..5c22c4e 100644
--- a/public/css/otalk.css
+++ b/public/css/otalk.css
@@ -894,20 +894,12 @@ h3 {
   padding: 20px;
   border-bottom: 1px solid #e4e4e4;
 }
+.main > div .status {
+  padding: 10px;
+}
 .main > div:last-of-type {
   border: none;
 }
-.main > div .status {
-  padding: 5px;
-  background: #f7f7f7;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  -khtml-border-radius: 3px;
-  -o-border-radius: 3px;
-  -border-radius: 3px;
-  border-radius: 3px;
-  font-size: 12px;
-}
 .uploadRegion {
   padding: 15px;
   font-size: 12px;
@@ -996,7 +988,8 @@ input[type=text],
 input[type=email],
 input[type=search],
 input[type=password],
-textarea {
+textarea,
+.main .status {
   -webkit-appearance: none;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -1026,7 +1019,8 @@ textarea {
 input[type=text],
 input[type=email],
 input[type=search],
-input[type=password] {
+input[type=password],
+.main .status {
   height: 35px;
 }
 textarea {
diff --git a/public/x-manifest.cache b/public/x-manifest.cache
index 79801b2..cb87b67 100644
--- a/public/x-manifest.cache
+++ b/public/x-manifest.cache
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 0.0.1 1382382268689
+# 0.0.1 1382530461409
 
 CACHE:
 /app.js