Skip to content

Commit

Permalink
Merge pull request #9851 from RocketChat/change-create-channel-icon
Browse files Browse the repository at this point in the history
Regression: Change create channel icon
  • Loading branch information
rodrigok authored Feb 23, 2018
2 parents 569c34b + 83e1d38 commit 53be5e9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions packages/rocketchat-ui-master/public/icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-sidenav/client/sidebarHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ const toolbarButtons = (user) => {
},
{
name: t('Create_A_New_Channel'),
icon: 'plus',
icon: 'edit-rounded',
condition: () => RocketChat.authz.hasAtLeastOnePermission(['create-c', 'create-p']),
action: () => {
menu.close();
Expand Down
2 changes: 1 addition & 1 deletion tests/pageobjects/side-nav.page.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class SideNav extends Page {
get spotlightSearchIcon() { return browser.element('.sidebar__toolbar-button-icon--magnifier'); }
get spotlightSearch() { return browser.element('.toolbar__search input'); }
get spotlightSearchPopUp() { return browser.element('.rooms-list__toolbar-search'); }
get newChannelBtn() { return browser.element('.sidebar__toolbar-button-icon--plus'); }
get newChannelBtn() { return browser.element('.sidebar__toolbar-button-icon--edit-rounded'); }
get newChannelIcon() { return browser.element('.toolbar__icon.toolbar__search-create-channel'); }

// Rooms List
Expand Down

0 comments on commit 53be5e9

Please sign in to comment.