Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Attachments background and fonts handled when WC will be bumped to 4.8 #2088

Merged
merged 4 commits into from
Mar 3, 2020
Merged

Attachments background and fonts handled when WC will be bumped to 4.8 #2088

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4555e5c
Attachments background and fonts handled when WC will be bumped to
Feb 28, 2020
dfb6d7e
Changelogs updated
Feb 28, 2020
8376e0a
typo fixed
Feb 28, 2020
2ac633e
Updated tests for fileContent inside styleset
Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/app/client/src/ui/editor/emulator/parts/chat/chat.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
//

:export { bubbleContentColor: var(--bubble-text-color); }
:export { bubbleBackground: var(--webchat-user-bubble-bg); }

.chat {
background-color: white;
Expand Down
1 change: 1 addition & 0 deletions packages/app/client/src/ui/editor/emulator/parts/chat/chat.scss.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// This is a generated file. Changes are likely to result in being overwritten
export const bubbleContentColor: string;
export const bubbleBackground: string;
export const chat: string;
export const disconnected: string;
export const chatActivity: string;
Expand Down
21 changes: 13 additions & 8 deletions packages/app/client/src/ui/editor/emulator/parts/chat/chat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,22 @@ export class Chat extends PureComponent<ChatProps, ChatState> {
const styleSet = createStyleSet({ ...webChatStyleOptions, hideSendBox: isDisabled });

// Overriding default styles of webchat as these properties are not exposed directly
styleSet.uploadButton = {
...styleSet.uploadButton,
padding: '1px',
};
styleSet.uploadAttachment = {
...styleSet.uploadAttachment,
'& > .name, & > .size': {
styleSet.fileContent = {
...styleSet.fileContent,
background: styles.bubbleBackground,
'& .webchat__fileContent__fileName': {
color: styles.bubbleContentColor,
},
'& .webchat__fileContent__size': {
color: styles.bubbleContentColor,
},
'& .webchat__fileContent__downloadIcon': {
fill: styles.bubbleContentColor,
},
'& .webchat__fileContent__badge': {
padding: '4px',
},
};
styleSet.downloadAttachment = updateDownloadAttachmentStyle(styleSet.downloadAttachment);
srinaath marked this conversation as resolved.
Show resolved Hide resolved

if (directLine) {
const bot = {
Expand Down