summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2017-05-01 09:18:21 +0500
committerChristopher Speller <crspeller@gmail.com>2017-05-01 00:18:21 -0400
commit5ab7726c1ec72678e505b87335eb011f97a09b3c (patch)
tree196c3727bba1dd0b81fae9b2b26689f0a5652378 /webapp/components
parent6f6b7e4e97f466ee0f29c96b7fee0d9b98ce751c (diff)
downloadchat-5ab7726c1ec72678e505b87335eb011f97a09b3c.tar.gz
chat-5ab7726c1ec72678e505b87335eb011f97a09b3c.tar.bz2
chat-5ab7726c1ec72678e505b87335eb011f97a09b3c.zip
Multiple Ui fixes (#6272)
* PLT-6453 - Improving headings in the web app * PLT-6414 - Fixing view members modal issue * PLT-5863 - Fixing alignment in new channel menu * PLT-6391 - Fixing code block overlay
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/code_preview.jsx22
-rw-r--r--webapp/components/new_channel_modal.jsx2
-rw-r--r--webapp/components/popover_list_members/popover_list_members.jsx3
3 files changed, 14 insertions, 13 deletions
diff --git a/webapp/components/code_preview.jsx b/webapp/components/code_preview.jsx
index 67088972a..a4a708adf 100644
--- a/webapp/components/code_preview.jsx
+++ b/webapp/components/code_preview.jsx
@@ -118,16 +118,18 @@ export default class CodePreview extends React.Component {
<span className='post-code__language'>
{`${this.props.fileInfo.name} - ${language}`}
</span>
- <code className='hljs'>
- <table>
- <tbody>
- <tr>
- <td className='post-code__lineno'>{strlines}</td>
- <td dangerouslySetInnerHTML={{__html: highlighted}}/>
- </tr>
- </tbody>
- </table>
- </code>
+ <div className='post-code__container'>
+ <code className='hljs'>
+ <table>
+ <tbody>
+ <tr>
+ <td className='post-code__lineno'>{strlines}</td>
+ <td dangerouslySetInnerHTML={{__html: highlighted}}/>
+ </tr>
+ </tbody>
+ </table>
+ </code>
+ </div>
</div>
);
}
diff --git a/webapp/components/new_channel_modal.jsx b/webapp/components/new_channel_modal.jsx
index 7f78c53c2..49103b7a8 100644
--- a/webapp/components/new_channel_modal.jsx
+++ b/webapp/components/new_channel_modal.jsx
@@ -113,7 +113,7 @@ export default class NewChannelModal extends React.Component {
}
if (this.props.serverError) {
- serverError = <div className='form-group has-error'><p className='input__help error'>{this.props.serverError}</p></div>;
+ serverError = <div className='form-group has-error'><div className='col-sm-12'><p className='input__help error'>{this.props.serverError}</p></div></div>;
}
let createPublicChannelLink = (
diff --git a/webapp/components/popover_list_members/popover_list_members.jsx b/webapp/components/popover_list_members/popover_list_members.jsx
index e435126ff..cf6042943 100644
--- a/webapp/components/popover_list_members/popover_list_members.jsx
+++ b/webapp/components/popover_list_members/popover_list_members.jsx
@@ -177,8 +177,7 @@ export default class PopoverListMembers extends React.Component {
className='more-modal__row'
key={'popover-member-more'}
>
- <div className='col-sm-3'/>
- <div className='more-modal__details'>
+ <div className='more-modal__details text-center'>
<div
className='more-modal__name'
>