contextual bar new roles icons

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
 });

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 {

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) {

packages/rocketchat-ui-master/public/icons.svg

@@ -48,7 +48,7 @@
     <symbol viewBox="0 0 20 20" id="icon-snippet"><g stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M5.833 13.88L1.953 10l3.88-3.88" /><path d="M11.941 2.756L8.06 17.244" stroke-linecap="square" /><path d="M14.167 6.12l3.88 3.88-3.88 3.88" /></g></symbol>
     <symbol viewBox="0 0 20 20" id="icon-star"><path d="M10 15l-4.898 2.575.935-5.454-3.962-3.863 5.476-.796L10 2.5l2.45 4.962 5.475.796-3.962 3.863.935 5.454z" stroke-width="1.5" stroke="currentColor" /></symbol>
     <symbol viewBox="0 0 20 20" id="icon-strike"><g fill="none" fill-rule="evenodd"><path d="M5.775 13.259c.074.989.498 1.78 1.273 2.372.775.593 1.768.889 2.98.889 1.312 0 2.352-.311 3.122-.933.77-.621 1.155-1.458 1.155-2.51 0-.842-.258-1.511-.774-2.008-.516-.498-1.366-.894-2.551-1.19L9.782 9.56c-.788-.2-1.353-.442-1.694-.722a1.35 1.35 0 0 1-.512-1.095c0-.582.231-1.047.694-1.396.463-.35 1.075-.524 1.837-.524.714 0 1.3.165 1.758.496.457.33.736.79.837 1.377h1.436c-.058-.926-.46-1.685-1.206-2.278-.746-.592-1.672-.888-2.777-.888-1.212 0-2.189.3-2.932.9-.743.6-1.115 1.387-1.115 2.36 0 .815.235 1.467.706 1.957.471.489 1.225.866 2.262 1.13l1.468.381c.788.196 1.367.455 1.737.778.37.322.556.727.556 1.214 0 .566-.253 1.035-.758 1.408s-1.144.56-1.916.56c-.815 0-1.487-.178-2.016-.532-.529-.355-.838-.83-.928-1.428H5.775z" fill="currentColor" /><path d="M4.375 10h11.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="square" /></g></symbol>
-    <symbol viewBox="0 0 20 20" id="icon-team"><path d="M5.5 16.08c0-2.838 3.375-2.27 3.375-3.405 0 0 .065-.754-.307-1.135-.464-.473-.818-1.041-.818-1.986C7.75 8.144 8.757 7 10 7s2.25 1.143 2.25 2.554c0 .932-.345 1.512-.829 1.986-.353.372-.296 1.135-.296 1.135 0 1.135 3.375.567 3.375 3.405 0 0-.896.67-4.5.67s-4.5-.67-4.5-.67zm-.386-3.104a17.84 17.84 0 0 1-1.134-.086c-1.735-.19-2.23-.56-2.23-.56 0-2.838 3.375-2.27 3.375-3.405 0 0 .065-.754-.307-1.135C4.354 7.317 4 6.749 4 5.804 4 4.394 5.007 3.25 6.25 3.25S8.5 4.393 8.5 5.804m6.386 7.172c.426-.02.803-.05 1.134-.086 1.735-.19 2.23-.56 2.23-.56 0-2.838-3.375-2.27-3.375-3.405 0 0-.065-.754.307-1.135.464-.473.818-1.041.818-1.986 0-1.41-1.007-2.554-2.25-2.554S11.5 4.393 11.5 5.804" stroke="currentColor" stroke-width="1.5" fill="none" /></symbol>
+    <symbol viewBox="0 0 640 512" id="icon-team"><path d="M573.127 249.095C584.979 233.127 592 213.369 592 192c0-52.935-43.065-96-96-96-26.331 0-50.217 10.658-67.578 27.885a128.993 128.993 0 0 0-17.913-22.394C386.334 77.314 354.19 64 320 64s-66.334 13.314-90.51 37.49a129.115 129.115 0 0 0-17.913 22.394C194.217 106.658 170.331 96 144 96c-52.935 0-96 43.065-96 96 0 21.369 7.021 41.127 18.873 57.095C28.987 255.378 0 288.36 0 328v44c0 24.262 19.738 44 44 44h117.677c5.238 18.445 22.222 32 42.323 32h232c20.102 0 37.085-13.555 42.323-32H596c24.262 0 44-19.738 44-44v-44c0-39.64-28.986-72.622-66.873-78.905zM496 128c35.346 0 64 28.654 64 64s-28.654 64-64 64c-22.083 0-41.554-11.185-53.057-28.199C446.27 216.314 448 204.291 448 192s-1.73-24.314-5.057-35.801C454.446 139.185 473.917 128 496 128zM320 96c53.02 0 96 42.981 96 96s-42.98 96-96 96-96-42.981-96-96 42.98-96 96-96zm-176 32c22.083 0 41.554 11.185 53.057 28.199C193.73 167.686 192 179.709 192 192s1.73 24.314 5.057 35.801C185.554 244.815 166.083 256 144 256c-35.346 0-64-28.654-64-64s28.654-64 64-64zm16 224v32H44c-6.627 0-12-5.373-12-12v-44c0-26.51 21.49-48 48-48h25.655c24.374 10.662 52.272 10.681 76.689 0h22.81C178.452 292.976 160 320.372 160 352zm288 52c0 6.627-5.373 12-12 12H204c-6.627 0-12-5.373-12-12v-52c0-26.51 21.49-48 48-48h17.929c37.818 21.031 85.208 21.651 124.142 0H400c26.51 0 48 21.49 48 48v52zm160-32c0 6.627-5.373 12-12 12H480v-32c0-31.628-18.452-59.024-45.154-72h22.81c24.374 10.662 52.272 10.681 76.689 0H560c26.51 0 48 21.49 48 48v44z"/></symbol>
     <symbol viewBox="0 0 20 20" id="icon-trash"><g stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M4 6h12l-1 12H5zm8-2.5a2 2 0 1 0-4 0" /><path d="M8 10v5m4-5v5" stroke-linecap="square" /><path d="M2.5 3.5h15" stroke-linecap="round" stroke-linejoin="round" /></g></symbol>
     <symbol viewBox="0 0 20 20" id="icon-twitter"><path d="M17.13 6.634c.01.16.01.319.01.478 0 4.864-3.701 10.468-10.467 10.468-2.085 0-4.021-.604-5.65-1.652.296.035.58.046.888.046 1.72 0 3.304-.581 4.568-1.572a3.686 3.686 0 0 1-3.44-2.551c.228.034.456.056.695.056.33 0 .66-.045.968-.125a3.68 3.68 0 0 1-2.95-3.61v-.046c.49.273 1.06.444 1.663.467a3.677 3.677 0 0 1-1.64-3.064c0-.684.182-1.31.5-1.857a10.458 10.458 0 0 0 7.587 3.85 4.153 4.153 0 0 1-.091-.843A3.676 3.676 0 0 1 13.45 3a3.67 3.67 0 0 1 2.688 1.162 7.243 7.243 0 0 0 2.335-.889 3.67 3.67 0 0 1-1.617 2.028 7.376 7.376 0 0 0 2.118-.57 7.91 7.91 0 0 1-1.845 1.903z" /></symbol>
     <symbol viewBox="0 0 20 20" id="icon-upload"><path d="M16.89 16.188a.705.705 0 0 1-.703.703.705.705 0 0 1-.703-.703c0-.387.317-.704.704-.704.386 0 .703.317.703.704zm-2.953-.704a.705.705 0 0 0-.703.704c0 .386.317.703.704.703a.705.705 0 0 0 .703-.703.705.705 0 0 0-.704-.704zM19 13.797v3.656c0 .854-.693 1.547-1.547 1.547H2.547A1.547 1.547 0 0 1 1 17.453v-3.656c0-.854.693-1.547 1.547-1.547h4.36V8.759H5.053c-1.252 0-1.878-1.515-.995-2.401L9.005 1.41a1.409 1.409 0 0 1 1.99 0l4.946 4.947c.886.886.257 2.401-.995 2.401h-1.852v3.491h4.36c.853 0 1.546.693 1.546 1.547zM8.031 7.634v6.585c0 .154.127.281.281.281h3.376a.282.282 0 0 0 .28-.281V7.634h2.978c.25 0 .377-.302.2-.482L10.2 2.206a.282.282 0 0 0-.397 0L4.857 7.152a.283.283 0 0 0 .2.482h2.974zm9.844 6.163a.423.423 0 0 0-.422-.422h-4.36v.844c0 .777-.629 1.406-1.405 1.406H8.312c-.776 0-1.406-.63-1.406-1.406v-.844h-4.36a.423.423 0 0 0-.421.422v3.656c0 .232.19.422.422.422h14.906c.232 0 .422-.19.422-.422v-3.656z" /></symbol>
@@ -78,4 +78,9 @@
     <symbol viewBox="0 0 24 24" id="icon-arrow-down"><path d="M18.585 12.1L12.5 18.185 6.415 12.1" stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"/></symbol>
     <symbol viewBox="0 0 320 512" id="icon-mobile"><path d="M192 416c0 17.7-14.3 32-32 32s-32-14.3-32-32 14.3-32 32-32 32 14.3 32 32zM320 48v416c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V48C0 21.5 21.5 0 48 0h224c26.5 0 48 21.5 48 48zm-32 0c0-8.8-7.2-16-16-16H48c-8.8 0-16 7.2-16 16v416c0 8.8 7.2 16 16 16h224c8.8 0 16-7.2 16-16V48z"/></symbol>
     <symbol viewBox="0 0 448 512" id="icon-hand-pointer"><path d="M360.543 188.156c-17.46-28.491-54.291-37.063-82.138-19.693-15.965-20.831-42.672-28.278-66.119-20.385V60.25c0-33.222-26.788-60.25-59.714-60.25S92.857 27.028 92.857 60.25v181.902c-20.338-13.673-47.578-13.89-68.389 1.472-26.556 19.605-32.368 57.08-13.132 83.926l114.271 159.5C136.803 502.673 154.893 512 174 512h185.714c27.714 0 51.832-19.294 58.145-46.528l28.571-123.25a60.769 60.769 0 0 0 1.57-13.723v-87c0-45.365-48.011-74.312-87.457-53.343zM82.097 275.588l28.258 39.439a7.999 7.999 0 1 0 14.503-4.659V60.25c0-37.35 55.428-37.41 55.428 0V241.5a8 8 0 0 0 8 8h7.144a8 8 0 0 0 8-8v-36.25c0-37.35 55.429-37.41 55.429 0v36.25a8 8 0 0 0 8 8H274a8 8 0 0 0 8-8v-21.75c0-37.351 55.429-37.408 55.429 0v21.75a8 8 0 0 0 8 8h7.143a8 8 0 0 0 8-8c0-37.35 55.429-37.41 55.429 0v87c0 2.186-.25 4.371-.742 6.496l-28.573 123.251C383.717 471.055 372.626 480 359.715 480H174c-8.813 0-17.181-4.332-22.381-11.588l-114.283-159.5c-22.213-31.004 23.801-62.575 44.761-33.324zM180.285 401v-87a8 8 0 0 1 8-8h7.144a8 8 0 0 1 8 8v87a8 8 0 0 1-8 8h-7.144a8 8 0 0 1-8-8zm78.572 0v-87a8 8 0 0 1 8-8H274a8 8 0 0 1 8 8v87a8 8 0 0 1-8 8h-7.143a8 8 0 0 1-8-8zm78.572 0v-87a8 8 0 0 1 8-8h7.143a8 8 0 0 1 8 8v87a8 8 0 0 1-8 8h-7.143a8 8 0 0 1-8-8z"/></symbol>
+    <symbol viewBox="0 0 512 512" id="icon-shield"><path d="M466.5 83.7l-192-80a48.15 48.15 0 0 0-36.9 0l-192 80C27.7 91.1 16 108.6 16 128c0 198.5 114.5 335.7 221.5 380.3 11.8 4.9 25.1 4.9 36.9 0C360.1 472.6 496 349.3 496 128c0-19.4-11.7-36.9-29.5-44.3zM262.2 478.8c-3.9 1.6-8.3 1.6-12.3 0C152 440 48 304 48 128c0-6.5 3.9-12.3 9.8-14.8l192-80c3.8-1.6 8.3-1.7 12.3 0l192 80c6 2.5 9.8 8.3 9.8 14.8.1 176-103.9 312-201.7 350.8z"/></symbol>
+    <symbol viewBox="0 0 512 512" id="icon-shield-alt"><path d="M256 410.955V99.999l-142.684 59.452C123.437 279.598 190.389 374.493 256 410.955zm-32-66.764c-36.413-39.896-65.832-97.846-76.073-164.495L224 147.999v196.192zM466.461 83.692l-192-80a47.996 47.996 0 0 0-36.923 0l-192 80A48 48 0 0 0 16 128c0 198.487 114.495 335.713 221.539 380.308a48 48 0 0 0 36.923 0C360.066 472.645 496 349.282 496 128a48 48 0 0 0-29.539-44.308zM262.154 478.768a16.64 16.64 0 0 1-12.31-.001C152 440 48 304 48 128c0-6.48 3.865-12.277 9.846-14.769l192-80a15.99 15.99 0 0 1 12.308 0l192 80A15.957 15.957 0 0 1 464 128c0 176-104 312-201.846 350.768z"/></symbol>
+    <symbol viewBox="0 0 512 512" id="icon-shield-check"><path d="M466.461 83.692l-192-80a47.996 47.996 0 0 0-36.923 0l-192 80A48 48 0 0 0 16 128c0 198.487 114.495 335.713 221.539 380.308a48 48 0 0 0 36.923 0C360.066 472.645 496 349.282 496 128a48 48 0 0 0-29.539-44.308zM262.154 478.768a16.64 16.64 0 0 1-12.31-.001C152 440 48 304 48 128c0-6.48 3.865-12.277 9.846-14.769l192-80a15.99 15.99 0 0 1 12.308 0l192 80A15.957 15.957 0 0 1 464 128c0 176-104 312-201.846 350.768zm144.655-299.505l-180.48 179.032c-4.705 4.667-12.303 4.637-16.97-.068l-85.878-86.572c-4.667-4.705-4.637-12.303.068-16.97l8.52-8.451c4.705-4.667 12.303-4.637 16.97.068l68.976 69.533 163.441-162.13c4.705-4.667 12.303-4.637 16.97.068l8.451 8.52c4.668 4.705 4.637 12.303-.068 16.97z"/></symbol>
+    <symbol viewBox="0 0 640 512" id="icon-team"><path d="M573.127 249.095C584.979 233.127 592 213.369 592 192c0-52.935-43.065-96-96-96-26.331 0-50.217 10.658-67.578 27.885a128.993 128.993 0 0 0-17.913-22.394C386.334 77.314 354.19 64 320 64s-66.334 13.314-90.51 37.49a129.115 129.115 0 0 0-17.913 22.394C194.217 106.658 170.331 96 144 96c-52.935 0-96 43.065-96 96 0 21.369 7.021 41.127 18.873 57.095C28.987 255.378 0 288.36 0 328v44c0 24.262 19.738 44 44 44h117.677c5.238 18.445 22.222 32 42.323 32h232c20.102 0 37.085-13.555 42.323-32H596c24.262 0 44-19.738 44-44v-44c0-39.64-28.986-72.622-66.873-78.905zM496 128c35.346 0 64 28.654 64 64s-28.654 64-64 64c-22.083 0-41.554-11.185-53.057-28.199C446.27 216.314 448 204.291 448 192s-1.73-24.314-5.057-35.801C454.446 139.185 473.917 128 496 128zM320 96c53.02 0 96 42.981 96 96s-42.98 96-96 96-96-42.981-96-96 42.98-96 96-96zm-176 32c22.083 0 41.554 11.185 53.057 28.199C193.73 167.686 192 179.709 192 192s1.73 24.314 5.057 35.801C185.554 244.815 166.083 256 144 256c-35.346 0-64-28.654-64-64s28.654-64 64-64zm16 224v32H44c-6.627 0-12-5.373-12-12v-44c0-26.51 21.49-48 48-48h25.655c24.374 10.662 52.272 10.681 76.689 0h22.81C178.452 292.976 160 320.372 160 352zm288 52c0 6.627-5.373 12-12 12H204c-6.627 0-12-5.373-12-12v-52c0-26.51 21.49-48 48-48h17.929c37.818 21.031 85.208 21.651 124.142 0H400c26.51 0 48 21.49 48 48v52zm160-32c0 6.627-5.373 12-12 12H480v-32c0-31.628-18.452-59.024-45.154-72h22.81c24.374 10.662 52.272 10.681 76.689 0H560c26.51 0 48 21.49 48 48v44z"/></symbol>
+    <symbol viewBox="0 0 640 512" id="icon-user-plus"><path d="M624 332v8c0 6.627-5.373 12-12 12h-68v68c0 6.627-5.373 12-12 12h-8c-6.627 0-12-5.373-12-12v-68h-68c-6.627 0-12-5.373-12-12v-8c0-6.627 5.373-12 12-12h68v-68c0-6.627 5.373-12 12-12h8c6.627 0 12 5.373 12 12v68h68c6.627 0 12 5.373 12 12zm-209.796 60.045A72.186 72.186 0 0 1 416 408v16c0 13.255-10.745 24-24 24H56c-13.255 0-24-10.745-24-24v-16c0-39.765 32.235-72 72-72h50.196c44.019 21.336 95.521 21.369 139.609 0H344c15.072 0 29.057 4.639 40.62 12.555-1.281-8.932-1.108-24.647 2.376-35.244C373.884 307.334 359.325 304 344 304h-5.753C367.477 274.198 384 234.32 384 192c0-88.353-71.613-160-160-160-88.353 0-160 71.613-160 160 0 42.261 16.481 82.155 45.753 112H104C46.654 304 0 350.654 0 408v16c0 30.879 25.122 56 56 56h336c30.879 0 56-25.121 56-56v-16c0-2.691-.103-5.359-.305-8-11.7 0-21.636-1.141-33.491-7.955zM96 192c0-70.693 57.308-128 128-128s128 57.307 128 128-57.308 128-128 128S96 262.693 96 192z"/></symbol>
 </svg>