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

[FIX] UI/UX issues on Live Chat widget #25407

Merged
merged 8 commits into from
May 16, 2022
Merged

[FIX] UI/UX issues on Live Chat widget #25407

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
83f2dd3
[FIX] UI/UX issues on Live Chat widget
MartinSchoeler May 5, 2022
69b0f53
Use @rocketchat/logo
MartinSchoeler May 12, 2022
6df6a76
READ THE ERRORS MARTIN
MartinSchoeler May 12, 2022
5e3cf0c
Remove old logo
MartinSchoeler May 12, 2022
264bff2
Merge remote-tracking branch 'origin/develop' into livechat/fix-ui-is…
MartinSchoeler May 12, 2022
e10d99d
Fix Reviews
MartinSchoeler May 16, 2022
2129d1e
Merge branch 'develop' into livechat/fix-ui-issues
dougfabris May 16, 2022
239d128
chore: remove unnecessary class prop
dougfabris May 16, 2022
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
2 changes: 2 additions & 0 deletions packages/livechat/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@
},
"dependencies": {
"@kossnocorp/desvg": "^0.2.0",
"@rocket.chat/fuselage-tokens": "~0.31.11",
"@rocket.chat/logo": "^0.31.11",
"@rocket.chat/sdk": "^1.0.0-alpha.42",
"@rocket.chat/ui-kit": "^0.14.1",
"crypto-js": "^4.1.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/livechat/src/components/Footer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { RocketChatLogo } from '@rocket.chat/logo';
import { withTranslation } from 'react-i18next';

import { PopoverMenu } from '../Menu';
import { createClassName } from '../helpers';
import Logo from './logo.svg';
import styles from './styles.scss';


Expand All @@ -23,8 +23,8 @@ export const FooterContent = ({ children, className, ...props }) => (
export const PoweredBy = withTranslation()(({ className, t, ...props }) => (
<h3 className={createClassName(styles, 'powered-by', {}, [className])} {...props}>
{t('powered_by_rocket_chat').split('Rocket.Chat')[0]}
<a href='https://rocket.chat' target='_blank' rel='noopener noreferrer'>
<Logo className={createClassName(styles, 'powered-by__logo')} width={60} height={60 * 272 / 1500} role='img' aria-label='Rocket.Chat' />
<a style={{ height: '10px', display: 'inline-flex', alignItems: 'center' }} href='https://rocket.chat' target='_blank' rel='noopener noreferrer'>
dougfabris marked this conversation as resolved.
Show resolved Hide resolved
<RocketChatLogo />
</a>
{t('powered_by_rocket_chat').split('Rocket.Chat')[1]}
</h3>
Expand Down
21 changes: 0 additions & 21 deletions packages/livechat/src/components/Footer/logo.svg
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions packages/livechat/src/components/uiKit/message/PlainText/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.uikit-plain-text {
text-align: left;
white-space: normal;
word-wrap: break-word;
word-break: break-word;
}
2 changes: 2 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3829,6 +3829,8 @@ __metadata:
"@babel/preset-env": ^7.11.5
"@kossnocorp/desvg": ^0.2.0
"@rocket.chat/eslint-config": ^0.4.0
"@rocket.chat/fuselage-tokens": ~0.31.11
"@rocket.chat/logo": ^0.31.11
"@rocket.chat/sdk": ^1.0.0-alpha.42
"@rocket.chat/ui-kit": ^0.14.1
"@storybook/addon-actions": ^6.0.12
Expand Down