-
Notifications
You must be signed in to change notification settings - Fork 10.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9481 from RocketChat/contextual-bar-redesign
[FIX] Contextual bar redesign
- Loading branch information
Showing
38 changed files
with
1,099 additions
and
585 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
19 changes: 11 additions & 8 deletions
19
packages/rocketchat-channel-settings-mail-messages/client/lib/startup.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,15 @@ | ||
import resetSelection from '../resetSelection'; | ||
// import resetSelection from '../resetSelection'; | ||
Meteor.startup(() => { | ||
RocketChat.ChannelSettings.addOption({ | ||
group: ['room'], | ||
RocketChat.TabBar.addButton({ | ||
groups: ['channel', 'group', 'direct'], | ||
id: 'mail-messages', | ||
template: 'channelSettingsMailMessages', | ||
validation() { | ||
return RocketChat.authz.hasAllPermission('mail-messages'); | ||
} | ||
anonymous: true, | ||
i18nTitle: 'Mail_Messages', | ||
icon: 'mail', | ||
template: 'mailMessagesInstructions', | ||
order: 10, | ||
condition: () => RocketChat.authz.hasAllPermission('mail-messages') | ||
}); | ||
RocketChat.callbacks.add('roomExit', () => resetSelection(false), RocketChat.callbacks.priority.MEDIUM, 'room-exit-mail-messages'); | ||
|
||
// RocketChat.callbacks.add('roomExit', () => resetSelection(false), RocketChat.callbacks.priority.MEDIUM, 'room-exit-mail-messages'); | ||
}); |
19 changes: 0 additions & 19 deletions
19
packages/rocketchat-channel-settings-mail-messages/client/stylesheets/mail-messages.less
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
...s/rocketchat-channel-settings-mail-messages/client/views/channelSettingsMailMessages.html
This file was deleted.
Oops, something went wrong.
17 changes: 0 additions & 17 deletions
17
...ges/rocketchat-channel-settings-mail-messages/client/views/channelSettingsMailMessages.js
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.