Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
Bob Potterveld committed Dec 7, 2020
2 parents e9420f1 + 9c94815 commit 9e57ca4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 2 additions & 2 deletions lex-web-ui/src/components/LexWeb.vue
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ export default {
},
// messages from parent
messageHandler(evt) {
const messageType = this.$store.state.config.ui.hideButtonMessageBubble ? 'button' : 'human';
// security check
if (evt.origin !== this.$store.state.config.ui.parentOrigin) {
console.warn('ignoring event - invalid origin:', evt.origin);
Expand Down Expand Up @@ -341,10 +342,9 @@ export default {
});
return;
}
this.$store.dispatch(
'postTextMessage',
{ type: 'human', text: evt.data.message },
{ type: messageType, text: evt.data.message },
)
.then(() => evt.ports[0].postMessage({
event: 'resolve', type: evt.data.event,
Expand Down
8 changes: 4 additions & 4 deletions src/lex-web-ui-loader/css/lex-web-ui-iframe.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}

.lex-web-ui-iframe--minimize {
max-width: 85px !important;
max-width: 190px !important;
max-height: 85px !important;
border-radius: 85px !important;
}
Expand All @@ -43,7 +43,7 @@ only screen and (max-height: 256px)
}

.lex-web-ui-iframe--minimize {
max-width: 85px !important;
max-width: 190px !important;
max-height: 85px !important;
}
}
Expand All @@ -59,7 +59,7 @@ and (max-width: 480px) {
}

.lex-web-ui-iframe--minimize {
max-width: 85px !important;
max-width: 190px !important;
max-height: 85px !important;
border-radius: 85px !important;
}
Expand All @@ -75,7 +75,7 @@ and (max-width: 960px) {
}

.lex-web-ui-iframe.lex-web-ui-iframe--show.lex-web-ui-iframe--minimize {
max-width: 85px !important;
max-width: 190px !important;
max-height: 85px !important;
border-radius: 85px !important;
min-width: 85px !important;
Expand Down
6 changes: 5 additions & 1 deletion src/website/custom-chatbot-style.css
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,8 @@
*/
button.min-button {
border-radius: 60px;
}
}

.message-button {
display: none;
}

0 comments on commit 9e57ca4

Please sign in to comment.