Browse Source

Improved dropbox on mobile view

Closes #1017
master
Igor Zhukov 8 years ago
parent
commit
ff6525da35
  1. 8
      app/js/directives.js
  2. 8
      app/less/mobile.less

8
app/js/directives.js

@ -1728,7 +1728,9 @@ angular.module('myApp.directives', ['myApp.filters']) @@ -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']) @@ -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);

8
app/less/mobile.less

@ -1806,6 +1806,14 @@ a.media_modal_date:hover { @@ -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;
}

Loading…
Cancel
Save