summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-02-05 10:07:57 -0500
committerJoram Wilander <jwawilander@gmail.com>2016-02-05 10:07:57 -0500
commit535abbf2ac7ba13bad59546e7ffb87c8f3972f22 (patch)
tree51fad98f4b33d2e386fc18748aed71e11519e02e /web/react
parent8e79f12f3c6c0f8858addaf6f66ea6e88a965b65 (diff)
parentc10b60e95f36aa86950feef1d63ed0e30b852be4 (diff)
downloadchat-535abbf2ac7ba13bad59546e7ffb87c8f3972f22.tar.gz
chat-535abbf2ac7ba13bad59546e7ffb87c8f3972f22.tar.bz2
chat-535abbf2ac7ba13bad59546e7ffb87c8f3972f22.zip
Merge pull request #2086 from asaadmahmoodspin/ui-improvements
Multiple UI improvements
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/admin_console/analytics.jsx10
-rw-r--r--web/react/components/channel_header.jsx2
2 files changed, 7 insertions, 5 deletions
diff --git a/web/react/components/admin_console/analytics.jsx b/web/react/components/admin_console/analytics.jsx
index 0a159d2e3..2a3070854 100644
--- a/web/react/components/admin_console/analytics.jsx
+++ b/web/react/components/admin_console/analytics.jsx
@@ -75,10 +75,12 @@ export default class Analytics extends React.Component {
}
let loading = (
- <FormattedMessage
- id='admin.analytics.loading'
- defaultMessage='Loading...'
- />
+ <h5>
+ <FormattedMessage
+ id='admin.analytics.loading'
+ defaultMessage='Loading...'
+ />
+ </h5>
);
let firstRow;
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 005a82209..8fc3cd63d 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -419,7 +419,7 @@ export default class ChannelHeader extends React.Component {
</ul>
</div>
<OverlayTrigger
- trigger={['hover', 'focus']}
+ trigger={'click'}
placement='bottom'
overlay={popoverContent}
ref='headerOverlay'