From d8407012d6f2f89287411e60c72b10c4401c8db4 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Mon, 19 Jan 2015 13:31:27 +0300
Subject: [PATCH] Minor fixes

Fixed default placeholder style
Fixed plain message textarea styles
Fixed emoji insert
---
 app/css/app.css                                 | 10 ++++++++++
 app/css/desktop.css                             |  5 +++--
 app/vendor/jquery.emojiarea/jquery.emojiarea.js |  8 +++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/css/app.css b/app/css/app.css
index a651e311..79068019 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -60,6 +60,16 @@ a.disabled {
   outline: none;
 }
 
+.form-control::-moz-placeholder {
+  color: #b3b3b3;
+}
+.form-control:-ms-input-placeholder {
+  color: #b3b3b3;
+}
+.form-control::-webkit-input-placeholder {
+  color: #b3b3b3;
+}
+
 input[type="number"]::-webkit-outer-spin-button,
 input[type="number"]::-webkit-inner-spin-button {
   -webkit-appearance: none;
diff --git a/app/css/desktop.css b/app/css/desktop.css
index 529be3bb..6d189519 100644
--- a/app/css/desktop.css
+++ b/app/css/desktop.css
@@ -971,7 +971,7 @@ a.im_panel_peer_photo .peer_initials {
   margin-bottom: 15px;
 }
 .emoji-wysiwyg-editor,
-.im_message_field {
+.form-control.im_message_field {
   border-radius: 0;
   border: 0;
   box-shadow: none;
@@ -984,7 +984,8 @@ a.im_panel_peer_photo .peer_initials {
   height: auto;
 }
 .emoji-wysiwyg-editor:focus,
-.im_message_field:focus {
+.form-control.im_message_field:focus {
+  border: 0;
   box-shadow: none;
   outline: none;
   box-shadow: 0 2px 0 0 #77b7e4;
diff --git a/app/vendor/jquery.emojiarea/jquery.emojiarea.js b/app/vendor/jquery.emojiarea/jquery.emojiarea.js
index 609dcda7..8d889bf1 100644
--- a/app/vendor/jquery.emojiarea/jquery.emojiarea.js
+++ b/app/vendor/jquery.emojiarea/jquery.emojiarea.js
@@ -402,9 +402,11 @@
 			$img[0].attachEvent('onresizestart', function(e) { e.returnValue = false; }, false);
 		}
 
-		this.$editor.trigger('focus');
-		if (this.selection) {
-			util.restoreSelection(this.selection);
+		if (!this.hasFocus) {
+			this.$editor.trigger('focus');
+			if (this.selection) {
+				util.restoreSelection(this.selection);
+			}
 		}
 		try { util.replaceSelection($img[0]); } catch (e) {}