Browse Source

Minor fixes

Fixed default placeholder style
Fixed plain message textarea styles
Fixed emoji insert
master
Igor Zhukov 9 years ago
parent
commit
d8407012d6
  1. 10
      app/css/app.css
  2. 5
      app/css/desktop.css
  3. 8
      app/vendor/jquery.emojiarea/jquery.emojiarea.js

10
app/css/app.css

@ -60,6 +60,16 @@ a.disabled { @@ -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;

5
app/css/desktop.css

@ -971,7 +971,7 @@ a.im_panel_peer_photo .peer_initials { @@ -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 { @@ -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;

8
app/vendor/jquery.emojiarea/jquery.emojiarea.js vendored

@ -402,9 +402,11 @@ @@ -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) {}

Loading…
Cancel
Save