diff options
author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-04-17 06:27:15 +0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-04-16 21:27:15 -0400 |
commit | 62974f19cd0025a3a5098741210f1b61b08765a9 (patch) | |
tree | 39924b82639900382437e322b2121bc2bd6ec753 /webapp/components | |
parent | 74ffb6f98f7ee8b4e61743919ab20460c57ad4da (diff) | |
download | chat-62974f19cd0025a3a5098741210f1b61b08765a9.tar.gz chat-62974f19cd0025a3a5098741210f1b61b08765a9.tar.bz2 chat-62974f19cd0025a3a5098741210f1b61b08765a9.zip |
Ui improvements (#6089)
* PLT-6084 - Fixing emoji reaction overflow
* PLT-6158 - Fixing pinned badge alignment in RHS
* PLT-6306 - Post alignment in compact view
* PLT-6266 - Adjusting spacing for files (compact)
* PLT-6245 - Adjusting spacing in emoji screen modal
* PLT-6237 - Adjusting filter in system console
* PLT-6247 - Adjusting spacing on code block tag
* PLT-6302 - Margins not equal for paragraphs in post
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/emoji/components/delete_emoji_modal.jsx | 2 | ||||
-rw-r--r-- | webapp/components/emoji_picker/components/emoji_picker_preview.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/emoji/components/delete_emoji_modal.jsx b/webapp/components/emoji/components/delete_emoji_modal.jsx index 604e3a27b..77afd4c01 100644 --- a/webapp/components/emoji/components/delete_emoji_modal.jsx +++ b/webapp/components/emoji/components/delete_emoji_modal.jsx @@ -25,7 +25,7 @@ export default class DeleteEmoji extends DeleteModalTrigger { get modalMessage() { return ( <div className='alert alert-warning'> - <i className='fa fa-warning'/> + <i className='fa fa-warning fa-margin--right'/> <FormattedMessage id='emoji_list.delete.confirm.msg' defaultMessage='This action permanently deletes the custom emoji. Are you sure you want to delete it?' diff --git a/webapp/components/emoji_picker/components/emoji_picker_preview.jsx b/webapp/components/emoji_picker/components/emoji_picker_preview.jsx index d88215b16..24acf9668 100644 --- a/webapp/components/emoji_picker/components/emoji_picker_preview.jsx +++ b/webapp/components/emoji_picker/components/emoji_picker_preview.jsx @@ -44,7 +44,7 @@ export default class EmojiPickerPreview extends React.Component { <div className='emoji-picker__preview-image-box'> {previewImage} </div> - <div className='emoji-picker__preview-image-box'> + <div className='emoji-picker__preview-detail-box'> <span className='emoji-picker__preview-name'>{name}</span> <span className='emoji-picker__preview-aliases' |