r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Minor fixes

Browse Source 
Fixed default placeholder style
Fixed plain message textarea styles
Fixed emoji insert
This commit is contained in:
Igor Zhukov 2015-01-19 13:31:27 +03:00
parent 5cc5d44bf2
commit d8407012d6
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/css/app.css
View File

@ -60,6 +60,16 @@ a.disabled {
outline: none; 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-outer-spin-button,
input[type="number"]::-webkit-inner-spin-button { input[type="number"]::-webkit-inner-spin-button {
-webkit-appearance: none; -webkit-appearance: none;

5
app/css/desktop.css
View File

@ -971,7 +971,7 @@ a.im_panel_peer_photo .peer_initials {
margin-bottom: 15px; margin-bottom: 15px;
} }
.emoji-wysiwyg-editor, .emoji-wysiwyg-editor,
.im_message_field { .form-control.im_message_field {
border-radius: 0; border-radius: 0;
border: 0; border: 0;
box-shadow: none; box-shadow: none;
@ -984,7 +984,8 @@ a.im_panel_peer_photo .peer_initials {
height: auto; height: auto;
} }
.emoji-wysiwyg-editor:focus, .emoji-wysiwyg-editor:focus,
.im_message_field:focus { .form-control.im_message_field:focus {
border: 0;
box-shadow: none; box-shadow: none;
outline: none; outline: none;
box-shadow: 0 2px 0 0 #77b7e4; box-shadow: 0 2px 0 0 #77b7e4;

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

@ -402,9 +402,11 @@
$img[0].attachEvent('onresizestart', function(e) { e.returnValue = false; }, false); $img[0].attachEvent('onresizestart', function(e) { e.returnValue = false; }, false);
} }
this.$editor.trigger('focus'); if (!this.hasFocus) {
if (this.selection) { this.$editor.trigger('focus');
util.restoreSelection(this.selection); if (this.selection) {
util.restoreSelection(this.selection);
}
} }
try { util.replaceSelection($img[0]); } catch (e) {} try { util.replaceSelection($img[0]); } catch (e) {}