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

Commit eac50aa

Browse files
committed
Remove old user and room settings
This takes out the old user and room settings, replacing the paths with the new dialog editions. The labs setting has been removed in order to support this change. In addition to removing the old components outright, some older components which were only used by the settings pages have been removed. The exception is the ColorSettings component as it has a high chance of sticking around in the future. Styles that were shared by the settings components have been broken out to dedicated sections, making it easier to remove the old styles entirely. Some stability testing of the app has been performed to ensure the app still works, however given the scope of this change there is a possibility of some broken functionality.
1 parent 24db3e4 commit eac50aa

36 files changed

+296
-3634
lines changed

.eslintignore.errorfiles

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,11 @@ src/components/views/rooms/MessageComposer.js
4444
src/components/views/rooms/PinnedEventTile.js
4545
src/components/views/rooms/RoomList.js
4646
src/components/views/rooms/RoomPreviewBar.js
47-
src/components/views/rooms/RoomSettings.js
4847
src/components/views/rooms/SearchableEntityList.js
4948
src/components/views/rooms/SearchBar.js
5049
src/components/views/rooms/SearchResultTile.js
5150
src/components/views/rooms/TopUnreadMessagesBar.js
5251
src/components/views/rooms/UserTile.js
53-
src/components/views/settings/AddPhoneNumber.js
5452
src/components/views/settings/ChangeAvatar.js
5553
src/components/views/settings/ChangePassword.js
5654
src/components/views/settings/DevicesPanel.js

res/css/_common.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,19 @@ textarea {
270270
opacity: 0.7;
271271
}
272272

273+
// TODO: Review mx_GeneralButton usage to see if it can use a different class
274+
// These classes were brought in from the old UserSettings and are included here to avoid
275+
// breaking the app.
276+
.mx_GeneralButton {
277+
@mixin mx_DialogButton;
278+
display: inline;
279+
margin: auto;
280+
}
281+
282+
.mx_GeneralButton:hover {
283+
@mixin mx_DialogButton_hover;
284+
}
285+
273286
.mx_linkButton {
274287
cursor: pointer;
275288
color: $accent-color;

res/css/_components.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
@import "./structures/_TagPanel.scss";
2222
@import "./structures/_TopLeftMenuButton.scss";
2323
@import "./structures/_UploadBar.scss";
24-
@import "./structures/_UserSettings.scss";
2524
@import "./structures/_ViewSource.scss";
2625
@import "./structures/auth/_Login.scss";
2726
@import "./views/auth/_AuthBody.scss";
@@ -42,6 +41,7 @@
4241
@import "./views/context_menus/_StatusMessageContextMenu.scss";
4342
@import "./views/context_menus/_TagTileContextMenu.scss";
4443
@import "./views/context_menus/_TopLeftMenu.scss";
44+
@import "./views/dialogs/_Analytics.scss";
4545
@import "./views/dialogs/_BugReportDialog.scss";
4646
@import "./views/dialogs/_ChangelogDialog.scss";
4747
@import "./views/dialogs/_ChatCreateOrReuseChatDialog.scss";
@@ -50,6 +50,7 @@
5050
@import "./views/dialogs/_CreateGroupDialog.scss";
5151
@import "./views/dialogs/_CreateRoomDialog.scss";
5252
@import "./views/dialogs/_DeactivateAccountDialog.scss";
53+
@import "./views/dialogs/_DeviceVerifyDialog.scss";
5354
@import "./views/dialogs/_DevtoolsDialog.scss";
5455
@import "./views/dialogs/_EncryptedEventDialog.scss";
5556
@import "./views/dialogs/_GroupAddressPicker.scss";
@@ -77,6 +78,7 @@
7778
@import "./views/elements/_HexVerify.scss";
7879
@import "./views/elements/_ImageView.scss";
7980
@import "./views/elements/_InlineSpinner.scss";
81+
@import "./views/elements/_ManageIntegsButton.scss";
8082
@import "./views/elements/_MemberEventListSummary.scss";
8183
@import "./views/elements/_ProgressBar.scss";
8284
@import "./views/elements/_ReplyThread.scss";
@@ -104,6 +106,8 @@
104106
@import "./views/messages/_SenderProfile.scss";
105107
@import "./views/messages/_TextualEvent.scss";
106108
@import "./views/messages/_UnknownBody.scss";
109+
@import "./views/room_settings/_AliasSettings.scss";
110+
@import "./views/room_settings/_ColorSettings.scss";
107111
@import "./views/rooms/_AppsDrawer.scss";
108112
@import "./views/rooms/_Autocomplete.scss";
109113
@import "./views/rooms/_AuxPanel.scss";
@@ -125,7 +129,6 @@
125129
@import "./views/rooms/_RoomList.scss";
126130
@import "./views/rooms/_RoomPreviewBar.scss";
127131
@import "./views/rooms/_RoomRecoveryReminder.scss";
128-
@import "./views/rooms/_RoomSettings.scss";
129132
@import "./views/rooms/_RoomTile.scss";
130133
@import "./views/rooms/_RoomTooltip.scss";
131134
@import "./views/rooms/_RoomUpgradeWarningBar.scss";

res/css/structures/_TabbedView.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ limitations under the License.
5151
color: $tab-label-active-fg-color;
5252
}
5353

54-
// TODO: Remove temporary hack alongside "visit old settings" tab
55-
.mx_TabbedView_tabLabel_TEMP_HACK {
56-
background-color: orange;
57-
}
58-
5954
.mx_TabbedView_maskedIcon {;
6055
margin-left: 6px;
6156
margin-right: 9px;

res/css/structures/_UserSettings.scss

Lines changed: 0 additions & 269 deletions
This file was deleted.

res/css/views/dialogs/_Analytics.scss

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
Copyright 2019 New Vector Ltd.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
.mx_AnalyticsModal table {
18+
margin: 10px 0px;
19+
}

0 commit comments

Comments
 (0)