diff options
| author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-06-23 07:28:04 +0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-06-22 22:28:04 -0400 |
| commit | dfbb16521c9d10cd491429874660bfdde3e19e1d (patch) | |
| tree | c83559476382e2d2b600f49a2575c2f8896552fe /webapp/components | |
| parent | d8cd38f4831ea2cd6a42e1d8aa68c0b24c3a4bd1 (diff) | |
| download | chat-dfbb16521c9d10cd491429874660bfdde3e19e1d.tar.gz chat-dfbb16521c9d10cd491429874660bfdde3e19e1d.tar.bz2 chat-dfbb16521c9d10cd491429874660bfdde3e19e1d.zip | |
Minor bug and UI fixes (#6729)
* PLT-6797 - Code block language tag not selectable
* PLT-6771 - Aligning search box with RHS
* PLT-6827 - Fixing link color in error bar
* PLT-6241 - Adding edge detection
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/channel_view.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/new_channel_modal/new_channel_modal.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/search_bar.jsx | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/webapp/components/channel_view.jsx b/webapp/components/channel_view.jsx index 3f6edbd2e..35d2a5891 100644 --- a/webapp/components/channel_view.jsx +++ b/webapp/components/channel_view.jsx @@ -44,7 +44,7 @@ export default class ChannelView extends React.Component { $('body').addClass('app__body'); // IE Detection - if (UserAgent.isInternetExplorer()) { + if (UserAgent.isInternetExplorer() || UserAgent.isEdge()) { $('body').addClass('browser--ie'); } } diff --git a/webapp/components/new_channel_modal/new_channel_modal.jsx b/webapp/components/new_channel_modal/new_channel_modal.jsx index d77c29d64..60c0271a7 100644 --- a/webapp/components/new_channel_modal/new_channel_modal.jsx +++ b/webapp/components/new_channel_modal/new_channel_modal.jsx @@ -112,7 +112,7 @@ export default class NewChannelModal extends React.PureComponent { componentDidMount() { // ??? - if (UserAgent.isInternetExplorer()) { + if (UserAgent.isInternetExplorer() || UserAgent.isEdge()) { $('body').addClass('browser--ie'); } } diff --git a/webapp/components/search_bar.jsx b/webapp/components/search_bar.jsx index 7e2cecede..94760dfdf 100644 --- a/webapp/components/search_bar.jsx +++ b/webapp/components/search_bar.jsx @@ -255,7 +255,6 @@ export default class SearchBar extends React.Component { mentionBtn = ( <div className='dropdown channel-header__links' - style={{float: 'left', marginTop: '1px'}} > <OverlayTrigger delayShow={Constants.OVERLAY_TIME_DELAY} @@ -279,7 +278,6 @@ export default class SearchBar extends React.Component { flagBtn = ( <div className='dropdown channel-header__links' - style={{float: 'left', marginTop: '1px'}} > <OverlayTrigger delayShow={Constants.OVERLAY_TIME_DELAY} |