diff --git a/packages/rocketchat-lib/client/defaultTabBars.js b/packages/rocketchat-lib/client/defaultTabBars.js index 0c9178f9122..5d8cf7c0f91 100644 --- a/packages/rocketchat-lib/client/defaultTabBars.js +++ b/packages/rocketchat-lib/client/defaultTabBars.js @@ -29,7 +29,7 @@ RocketChat.TabBar.addButton({ groups: ['channel', 'group'], id: 'addUsers', i18nTitle: 'Add_users', - icon: 'user', + icon: 'user-plus', template: 'inviteUsers', order: 2 }); diff --git a/packages/rocketchat-theme/client/imports/components/header.css b/packages/rocketchat-theme/client/imports/components/header.css index e945ee38e78..6b155f06f16 100644 --- a/packages/rocketchat-theme/client/imports/components/header.css +++ b/packages/rocketchat-theme/client/imports/components/header.css @@ -247,6 +247,10 @@ fill: none; } +.tab-bugtton-icon--team { + font-size: 28px; +} + @media (width <= 500px) { .rc-header { &__visual-status { diff --git a/packages/rocketchat-ui-flextab/client/tabs/userActions.js b/packages/rocketchat-ui-flextab/client/tabs/userActions.js index fc60cfcb35f..e5a3abb2e86 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/userActions.js +++ b/packages/rocketchat-ui-flextab/client/tabs/userActions.js @@ -201,6 +201,7 @@ export const getActions = function({ user, directActions, hideAdminControls }) { return { group: 'channel', name:t('Remove_as_owner'), + icon: 'shield-check', action: prevent(getUser, ({_id, username})=> { const userOwner = RoomRoles.findOne({ rid: Session.get('openedRoom'), 'u._id': _id, roles: 'owner' }, { fields: { _id: 1 } }); if (userOwner == null) { @@ -215,6 +216,7 @@ export const getActions = function({ user, directActions, hideAdminControls }) { return { group: 'channel', name: t('Set_as_owner'), + icon: 'shield-check', action: prevent(getUser, ({_id, username}) => { const userOwner = RoomRoles.findOne({ rid: Session.get('openedRoom'), 'u._id': _id, roles: 'owner' }, { fields: { _id: 1 } }); if (userOwner != null) { @@ -235,6 +237,7 @@ export const getActions = function({ user, directActions, hideAdminControls }) { return { group: 'channel', name: t('Remove_as_leader'), + icon: 'shield-alt', action: prevent(getUser, ({username, _id}) => { const userLeader = RoomRoles.findOne({ rid: Session.get('openedRoom'), 'u._id': _id, roles: 'leader' }, { fields: { _id: 1 } }); if (!userLeader) { @@ -250,6 +253,7 @@ export const getActions = function({ user, directActions, hideAdminControls }) { return { group: 'channel', name:t('Set_as_leader'), + icon: 'shield-alt', action: prevent(getUser, ({_id, username}) => { const userLeader = RoomRoles.findOne({ rid: Session.get('openedRoom'), 'u._id': _id, roles: 'leader' }, { fields: { _id: 1 } }); if (userLeader) { @@ -270,6 +274,7 @@ export const getActions = function({ user, directActions, hideAdminControls }) { return { group: 'channel', name: t('Remove_as_moderator'), + icon: 'shield', action: prevent(getUser, ({username, _id}) => { const userModerator = RoomRoles.findOne({ rid: Session.get('openedRoom'), 'u._id': _id, roles: 'moderator' }, { fields: { _id: 1 } }); if (userModerator == null) { @@ -285,6 +290,7 @@ export const getActions = function({ user, directActions, hideAdminControls }) { return { group: 'channel', name: t('Set_as_moderator'), + icon: 'shield', action: prevent(getUser, ({_id, username}) => { const userModerator = RoomRoles.findOne({ rid: Session.get('openedRoom'), 'u._id': _id, roles: 'moderator' }, { fields: { _id: 1 } }); if (userModerator != null) { diff --git a/packages/rocketchat-ui-master/public/icons.svg b/packages/rocketchat-ui-master/public/icons.svg index 0dc3c4aa913..463f804ab40 100644 --- a/packages/rocketchat-ui-master/public/icons.svg +++ b/packages/rocketchat-ui-master/public/icons.svg @@ -48,7 +48,7 @@ - + @@ -78,4 +78,9 @@ + + + + +