From ff6525da356865faa8efc347008d9f1cca36c762 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Mon, 8 Feb 2016 17:40:19 +0000 Subject: [PATCH] Improved dropbox on mobile view Closes #1017 --- app/js/directives.js | 8 ++++++-- app/less/mobile.less | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/js/directives.js b/app/js/directives.js index 5695b226..4a4bfbf8 100755 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -1728,7 +1728,9 @@ angular.module('myApp.directives', ['myApp.filters']) if (e.type == 'dragenter' || e.type == 'dragover') { if (dragStateChanged) { - $(emojiButton).hide(); + if (!Config.Mobile) { + $(emojiButton).hide(); + } $(dropbox) .css({height: messageFieldWrap.offsetHeight + 2, width: messageFieldWrap.offsetWidth}) .show(); @@ -1742,7 +1744,9 @@ angular.module('myApp.directives', ['myApp.filters']) } dragTimeout = setTimeout(function () { $(dropbox).hide(); - $(emojiButton).show(); + if (!Config.Mobile) { + $(emojiButton).show(); + } dragStarted = false; dragTimeout = false; }, 300); diff --git a/app/less/mobile.less b/app/less/mobile.less index 3e6e2a05..e40c09d5 100644 --- a/app/less/mobile.less +++ b/app/less/mobile.less @@ -1806,6 +1806,14 @@ a.media_modal_date:hover { padding: 6px 7px; top: 0; } + +.im_send_dropbox_wrap { + padding: 5px 10px; + font-size: 15px; + line-height: 22px; +} + + .im_send_field_panel { position: relative; }