From dc59a19b1e5dccd9f342d6b8a416556ba11b10f3 Mon Sep 17 00:00:00 2001
From: karolinaszczur <me@karolinaszczur.com>
Date: Fri, 25 Oct 2013 12:19:28 +0200
Subject: [PATCH] [ux] fix contenteditable status height bug

---
 public/css/otalk.css           | 13 ++++++-------
 public/css/pages/settings.styl | 13 ++++++++-----
 public/x-manifest.cache        |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/public/css/otalk.css b/public/css/otalk.css
index 78f29dd..46735ea 100644
--- a/public/css/otalk.css
+++ b/public/css/otalk.css
@@ -1114,6 +1114,12 @@ button.secondary:hover:not(:disabled) {
 .main > div:last-of-type {
   border: none;
 }
+.main > div .status {
+  overflow: hidden;
+  min-height: 35px;
+  max-height: 50px;
+  height: auto;
+}
 .uploadRegion {
   padding: 15px;
   -moz-border-radius: 3px;
@@ -1128,13 +1134,6 @@ button.secondary:hover:not(:disabled) {
 .uploadRegion p {
   margin: 0;
 }
-.uploadRegion input {
-  width: 100%;
-  padding: 5px;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-}
 .uploadRegion img {
   margin: 10px 0;
 }
diff --git a/public/css/pages/settings.styl b/public/css/pages/settings.styl
index 829916d..af86388 100644
--- a/public/css/pages/settings.styl
+++ b/public/css/pages/settings.styl
@@ -1,6 +1,8 @@
 @import '../_variables'
 @import '../_mixins'
 
+// Settings
+
 .main > div
   padding: 20px
   border-bottom: 1px solid $gray-lighter
@@ -8,6 +10,12 @@
   &:last-of-type
     border: none
 
+  .status
+    overflow: hidden
+    min-height: 35px
+    max-height: 50px
+    height: auto
+
 .uploadRegion
   padding: 15px
   roundall(3px)
@@ -17,10 +25,5 @@
   p
     margin: 0
 
-  input
-    width: 100%
-    padding: 5px
-    borderbox()
-
   img
     margin: 10px 0
diff --git a/public/x-manifest.cache b/public/x-manifest.cache
index b89ad58..f3f0854 100644
--- a/public/x-manifest.cache
+++ b/public/x-manifest.cache
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 0.0.1 1382695978402
+# 0.0.1 1382696342294
 
 CACHE:
 /app.js