IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Channel switcher UI improvements (#6564)

Browse Source 
* Channel switcher UI improvements

* Reverting mattermost theme

* Fixing spacing above the button

* Updating switcher button

* PLT-6691 - Fixing tablet header
This commit is contained in:
Asaad Mahmood
2017-06-07 02:24:23 +05:00
committed by Joram Wilander
parent 6e7b912ec6
commit 1eed253fc2
9 changed files with 67 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/quick_switch_modal/quick_switch_modal.jsx
View File

@@ -301,7 +301,7 @@ export default class QuickSwitchModal extends React.PureComponent {
<Modal.Header closeButton={true}/>
<Modal.Body>
{header}
<div className='modal__hint'>
<div className='modal__hint hidden-xs'>
{help}
</div>
<SuggestionBox

27
webapp/components/sidebar.jsx
View File

@@ -806,11 +806,13 @@ export default class Sidebar extends React.Component {
);
}
let quickSwitchText = 'sidebar.switch_channels';
let quickSwitchDefault = 'Switch Channels (CTRL + K)';
const quickSwitchText = 'channel_switch_modal.title';
let quickSwitchTextShortcut = 'quick_switch_modal.channelsShortcut.windows';
let quickSwitchDefault = '- CTRL+K';
if (Utils.isMac()) {
quickSwitchText += '.mac';
quickSwitchDefault = 'Switch Channels (CMD + K)';
quickSwitchTextShortcut = 'quick_switch_modal.channelsShortcut.mac';
quickSwitchDefault = '- ⌘K';
}
return (
@@ -913,17 +915,22 @@ export default class Sidebar extends React.Component {
{directMessageMore}
</ul>
</div>
<div style={{height: '20px', width: '100%'}}>
<a
href='#'
className='sidebar__switcher'
<div className='sidebar__switcher'>
<button
className='btn btn-link'
onClick={this.openQuickSwitcher}
>
<FormattedMessage
id={quickSwitchText}
defaultMessage={quickSwitchDefault}
defaultMessage='Switch Channels'
/>
</a>
<span className='switch__shortcut'>
<FormattedMessage
id={quickSwitchTextShortcut}
defaultMessage={quickSwitchDefault}
/>
</span>
</button>
</div>
</div>
);