Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Maintenance: Clean up some stuff around settings #2685

Merged
merged 7 commits into from
Feb 25, 2019

Conversation

turt2live
Copy link
Member

@turt2live turt2live commented Feb 22, 2019

Fixes element-hq/element-web#8864
Removes need for DragDropContext over flair settings
Fixes a technical bug where one could drag groups from settings over the LLP
Part of element-hq/element-web#8207

Note: It might be easiest to review this commit-by-commit

This also fixes a technical bug where one could drag a community from the settings to the LLP
@turt2live turt2live changed the title Maintenance: Cleanup some stuff around settings Maintenance: Clean up some stuff around settings Feb 22, 2019
@turt2live turt2live marked this pull request as ready for review February 22, 2019 18:39
@turt2live turt2live requested a review from a team February 22, 2019 18:39
@import "./views/settings/tabs/_SettingsTab.scss";
@import "./views/settings/tabs/_VoiceSettingsTab.scss";
@import "./views/settings/tabs/room/_GeneralRoomSettingsTab.scss";
@import "./views/settings/tabs/room/_RolesRoomSettingsTab.scss";
Copy link
Contributor

@bwindels bwindels Feb 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: IMO settings/room/tabs and settings/user/tabs would make more sense.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That sounds like a good improvement to make if we ever get rid of room_settings being a thing elsewhere (which I also want to do, but not right now)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have opened element-hq/element-web#8934 to track this

@turt2live
Copy link
Member Author

Merging because I'm confident the build will pass and I'm losing patience with waiting 2 hours for a build.

@turt2live turt2live merged commit 9a42d2e into develop Feb 25, 2019
@turt2live turt2live deleted the travis/settings-cleanup-1 branch February 25, 2019 18:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants