OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4849 from matrix-org/travis/room-list/remove-dm 

Remove the DM button from new room tiles
pull/21833/head
Travis Ralston 2020-06-28 20:04:12 -06:00 committed by GitHub
parent b9ce10bd6d 62467144ba
commit a36a03bd05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/css/views/rooms/_RoomTile2.scss
View File

@ -193,10 +193,6 @@ limitations under the License.
mask-image: url('$(res)/img/feather-customised/arrow-down.svg'); mask-image: url('$(res)/img/feather-customised/arrow-down.svg');
} }
.mx_RoomTile2_iconUser::before {
mask-image: url('$(res)/img/feather-customised/user.svg');
}
.mx_RoomTile2_iconSettings::before { .mx_RoomTile2_iconSettings::before {
mask-image: url('$(res)/img/feather-customised/settings.svg'); mask-image: url('$(res)/img/feather-customised/settings.svg');
} }

13
src/components/views/rooms/RoomTile2.tsx
View File

@ -135,11 +135,8 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
ev.preventDefault(); ev.preventDefault();
ev.stopPropagation(); ev.stopPropagation();
if (tagId === DefaultTagID.DM) { // TODO: Support tagging: https://github.com/vector-im/riot-web/issues/14211
// TODO: DM Flagging // TODO: XOR favourites and low priority: https://github.com/vector-im/riot-web/issues/14210
} else {
// TODO: XOR favourites and low priority
}
}; };
private onLeaveRoomClick = (ev: ButtonEvent) => { private onLeaveRoomClick = (ev: ButtonEvent) => {
@ -196,12 +193,6 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
<span>{_t("Low Priority")}</span> <span>{_t("Low Priority")}</span>
</AccessibleButton> </AccessibleButton>
</li> </li>
<li>
<AccessibleButton onClick={(e) => this.onTagRoom(e, DefaultTagID.DM)}>
<span className="mx_IconizedContextMenu_icon mx_RoomTile2_iconUser" />
<span>{_t("Direct Chat")}</span>
</AccessibleButton>
</li>
<li> <li>
<AccessibleButton onClick={this.onOpenRoomSettings}> <AccessibleButton onClick={this.onOpenRoomSettings}>
<span className="mx_IconizedContextMenu_icon mx_RoomTile2_iconSettings" /> <span className="mx_IconizedContextMenu_icon mx_RoomTile2_iconSettings" />

2
src/i18n/strings/en_EN.json
View File

@ -1220,7 +1220,6 @@
"Unread messages.": "Unread messages.", "Unread messages.": "Unread messages.",
"Favourite": "Favourite", "Favourite": "Favourite",
"Low Priority": "Low Priority", "Low Priority": "Low Priority",
"Direct Chat": "Direct Chat",
"Leave Room": "Leave Room", "Leave Room": "Leave Room",
"Room options": "Room options", "Room options": "Room options",
"Add a topic": "Add a topic", "Add a topic": "Add a topic",
@ -1898,6 +1897,7 @@
"Mentions only": "Mentions only", "Mentions only": "Mentions only",
"Leave": "Leave", "Leave": "Leave",
"Forget": "Forget", "Forget": "Forget",
"Direct Chat": "Direct Chat",
"Clear status": "Clear status", "Clear status": "Clear status",
"Update status": "Update status", "Update status": "Update status",
"Set status": "Set status", "Set status": "Set status",