chat client: fix send button, fix initial position
This commit is contained in:
parent
57941a83a6
commit
0912e0e42a
6 changed files with 17 additions and 13 deletions
|
@ -297,13 +297,13 @@ do($ = window.jQuery, window) ->
|
||||||
show: ->
|
show: ->
|
||||||
@el.addClass('zammad-chat-is-visible')
|
@el.addClass('zammad-chat-is-visible')
|
||||||
|
|
||||||
remainerHeight = @el.outerHeight() - @el.find('.zammad-chat-header').outerHeight()
|
|
||||||
|
|
||||||
@el.css 'bottom', -remainerHeight
|
|
||||||
|
|
||||||
@input.autoGrow
|
@input.autoGrow
|
||||||
extraLine: false
|
extraLine: false
|
||||||
|
|
||||||
|
remainerHeight = @el.height() - @el.find('.zammad-chat-header').outerHeight()
|
||||||
|
|
||||||
|
@el.css 'bottom', -remainerHeight
|
||||||
|
|
||||||
disableInput: ->
|
disableInput: ->
|
||||||
@input.prop('disabled', true)
|
@input.prop('disabled', true)
|
||||||
@el.find('.zammad-chat-send').prop('disabled', true)
|
@el.find('.zammad-chat-send').prop('disabled', true)
|
||||||
|
|
|
@ -158,7 +158,8 @@
|
||||||
.zammad-chat-modal-text .zammad-chat-loading-animation {
|
.zammad-chat-modal-text .zammad-chat-loading-animation {
|
||||||
font-size: 0.7em; }
|
font-size: 0.7em; }
|
||||||
.zammad-chat-modal-text .zammad-chat-button {
|
.zammad-chat-modal-text .zammad-chat-button {
|
||||||
margin-top: 1em; }
|
margin-top: 1em;
|
||||||
|
font-size: 0.8em; }
|
||||||
|
|
||||||
.zammad-chat-modal .zammad-chat-loading-animation {
|
.zammad-chat-modal .zammad-chat-loading-animation {
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
|
@ -173,7 +174,7 @@
|
||||||
.zammad-chat-timestamp {
|
.zammad-chat-timestamp {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: #999999;
|
color: #999999;
|
||||||
font-size: 0.8em;
|
font-size: 0.9em;
|
||||||
margin: 1em 0; }
|
margin: 1em 0; }
|
||||||
|
|
||||||
.zammad-chat-message {
|
.zammad-chat-message {
|
||||||
|
@ -310,7 +311,6 @@
|
||||||
border-radius: 1.5em;
|
border-radius: 1.5em;
|
||||||
box-shadow: 0 2px rgba(255, 255, 255, 0.25) inset, 0 0 0 1px #247fb7 inset, 0 1px rgba(0, 0, 0, 0.1);
|
box-shadow: 0 2px rgba(255, 255, 255, 0.25) inset, 0 0 0 1px #247fb7 inset, 0 1px rgba(0, 0, 0, 0.1);
|
||||||
outline: none;
|
outline: none;
|
||||||
font-size: 0.8em;
|
|
||||||
display: inline-block; }
|
display: inline-block; }
|
||||||
|
|
||||||
.zammad-chat-send {
|
.zammad-chat-send {
|
||||||
|
|
|
@ -393,11 +393,11 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
|
||||||
ZammadChat.prototype.show = function() {
|
ZammadChat.prototype.show = function() {
|
||||||
var remainerHeight;
|
var remainerHeight;
|
||||||
this.el.addClass('zammad-chat-is-visible');
|
this.el.addClass('zammad-chat-is-visible');
|
||||||
remainerHeight = this.el.outerHeight() - this.el.find('.zammad-chat-header').outerHeight();
|
this.input.autoGrow({
|
||||||
this.el.css('bottom', -remainerHeight);
|
|
||||||
return this.input.autoGrow({
|
|
||||||
extraLine: false
|
extraLine: false
|
||||||
});
|
});
|
||||||
|
remainerHeight = this.el.height() - this.el.find('.zammad-chat-header').outerHeight();
|
||||||
|
return this.el.css('bottom', -remainerHeight);
|
||||||
};
|
};
|
||||||
|
|
||||||
ZammadChat.prototype.disableInput = function() {
|
ZammadChat.prototype.disableInput = function() {
|
||||||
|
|
2
public/assets/chat/chat.min.js
vendored
2
public/assets/chat/chat.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -190,6 +190,7 @@ $baseTextColor: if($luminance < 0.2, white, black);
|
||||||
|
|
||||||
.zammad-chat-button {
|
.zammad-chat-button {
|
||||||
margin-top: 1em;
|
margin-top: 1em;
|
||||||
|
font-size: 0.8em;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -208,7 +209,7 @@ $baseTextColor: if($luminance < 0.2, white, black);
|
||||||
.zammad-chat-timestamp {
|
.zammad-chat-timestamp {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: hsl(0,0%,60%);
|
color: hsl(0,0%,60%);
|
||||||
font-size: 0.8em;
|
font-size: 0.9em;
|
||||||
margin: 1em 0;
|
margin: 1em 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -339,7 +340,6 @@ $baseTextColor: if($luminance < 0.2, white, black);
|
||||||
0 0 0 1px darken($themeColor, 10%) inset,
|
0 0 0 1px darken($themeColor, 10%) inset,
|
||||||
0 1px rgba(0,0,0,.1);
|
0 1px rgba(0,0,0,.1);
|
||||||
outline: none;
|
outline: none;
|
||||||
font-size: 0.8em;
|
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,10 @@
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mockup {
|
||||||
|
vertical-align: bottom;
|
||||||
|
}
|
||||||
|
|
||||||
.settings {
|
.settings {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
left: 20px;
|
left: 20px;
|
||||||
|
|
Loading…
Reference in a new issue