summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorAsaad Mahmood <asaad@spinpunch.com>2016-02-11 23:41:13 +0500
committerAsaad Mahmood <asaad@spinpunch.com>2016-02-11 23:41:13 +0500
commit6bf1203581a295e82116c23bc4fe2d9d29362cf4 (patch)
treebd50dc8c703ac000a9668ae14f304bd04e71100f /web/react
parent4ffbd3642ed8ad7961218845c7c89108c26a2737 (diff)
downloadchat-6bf1203581a295e82116c23bc4fe2d9d29362cf4.tar.gz
chat-6bf1203581a295e82116c23bc4fe2d9d29362cf4.tar.bz2
chat-6bf1203581a295e82116c23bc4fe2d9d29362cf4.zip
Multiple UI Improvements
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/admin_console/user_item.jsx2
-rw-r--r--web/react/components/channel_info_modal.jsx2
-rw-r--r--web/react/components/navbar.jsx2
-rw-r--r--web/react/components/team_general_tab.jsx8
-rw-r--r--web/react/components/user_settings/manage_incoming_hooks.jsx2
-rw-r--r--web/react/package.json1
-rw-r--r--web/react/utils/markdown.jsx2
7 files changed, 9 insertions, 10 deletions
diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx
index 0c1a55cc1..009a9f004 100644
--- a/web/react/components/admin_console/user_item.jsx
+++ b/web/react/components/admin_console/user_item.jsx
@@ -353,7 +353,7 @@ export default class UserItem extends React.Component {
return (
<tr>
- <td className='row member-div'>
+ <td className='row member-div padding--equal'>
<img
className='post-profile-img pull-left'
src={`/api/v1/users/${user.id}/image?time=${user.update_at}&${Utils.getSessionIndex()}`}
diff --git a/web/react/components/channel_info_modal.jsx b/web/react/components/channel_info_modal.jsx
index 5067f5913..83f5aba65 100644
--- a/web/react/components/channel_info_modal.jsx
+++ b/web/react/components/channel_info_modal.jsx
@@ -56,7 +56,7 @@ class ChannelInfoModal extends React.Component {
</div>
<div className='col-sm-9'>{channelURL}</div>
</div>
- <div className='row'>
+ <div className='row form-group'>
<div className='col-sm-3 info__label'>
<FormattedMessage
id='channel_info.id'
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index e6a9fbd25..06345b584 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -28,6 +28,7 @@ import {FormattedMessage} from 'mm-intl';
const Popover = ReactBootstrap.Popover;
const OverlayTrigger = ReactBootstrap.OverlayTrigger;
+const attachFastClick = require('fastclick');
export default class Navbar extends React.Component {
constructor(props) {
@@ -59,6 +60,7 @@ export default class Navbar extends React.Component {
ChannelStore.addChangeListener(this.onChange);
ChannelStore.addExtraInfoChangeListener(this.onChange);
$('.inner__wrap').click(this.hideSidebars);
+ attachFastClick(document.body);
}
componentWillUnmount() {
ChannelStore.removeChangeListener(this.onChange);
diff --git a/web/react/components/team_general_tab.jsx b/web/react/components/team_general_tab.jsx
index 0a1b02853..c1b2a2e7f 100644
--- a/web/react/components/team_general_tab.jsx
+++ b/web/react/components/team_general_tab.jsx
@@ -486,13 +486,9 @@ class GeneralTab extends React.Component {
inputs.push(
<div key='teamInviteSetting'>
<div className='row'>
- <label className='col-sm-5 control-label'>
- <FormattedMessage
- id='general_tab.codeTitle'
- defaultMessage='Invite Code'
- />
+ <label className='col-sm-5 control-label visible-xs-block'>
</label>
- <div className='col-sm-7'>
+ <div className='col-sm-12'>
<input
className='form-control'
type='text'
diff --git a/web/react/components/user_settings/manage_incoming_hooks.jsx b/web/react/components/user_settings/manage_incoming_hooks.jsx
index c6532b018..e79ec6f6c 100644
--- a/web/react/components/user_settings/manage_incoming_hooks.jsx
+++ b/web/react/components/user_settings/manage_incoming_hooks.jsx
@@ -183,7 +183,7 @@ export default class ManageIncomingHooks extends React.Component {
<div key='addIncomingHook'>
<FormattedHTMLMessage
id='user.settings.hooks_in.description'
- defaultMessage='Create webhook URLs for use in external integrations. Please see<a href="http://mattermost.org/webhooks" target="_blank">http://mattermost.org/webhooks</a> to learn more.'
+ defaultMessage='Create webhook URLs for use in external integrations. Please see <a href="http://mattermost.org/webhooks" target="_blank">http://mattermost.org/webhooks</a> to learn more.'
/>
<div><label className='control-label padding-top x2'>
<FormattedMessage
diff --git a/web/react/package.json b/web/react/package.json
index fce3e6555..5fc2f2851 100644
--- a/web/react/package.json
+++ b/web/react/package.json
@@ -4,6 +4,7 @@
"private": true,
"dependencies": {
"autolinker": "0.22.0",
+ "fastclick": "^1.0.6",
"flux": "2.1.1",
"highlight.js": "8.9.1",
"keymirror": "0.1.1",
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx
index 17f30a7c5..493916058 100644
--- a/web/react/utils/markdown.jsx
+++ b/web/react/utils/markdown.jsx
@@ -222,7 +222,7 @@ class MattermostMarkdownRenderer extends marked.Renderer {
}
table(header, body) {
- return `<table class="markdown__table"><thead>${header}</thead><tbody>${body}</tbody></table>`;
+ return `<div class="table-responsive"><table class="markdown__table"><thead>${header}</thead><tbody>${body}</tbody></table></div>`;
}
listitem(text) {