imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2891 from matrix-org/dbkr/simplify_settings_dialog_css

Browse source 
Simplify settings dialog CSS
This commit is contained in:
David Baker 2019-04-09 09:21:21 +01:00 • committed by GitHub
commit babed3e5ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

20
res/css/views/dialogs/_SettingsDialog.scss
View file

@ -14,13 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_SettingsDialog {
.mx_Dialog {
height: 80%;
border-radius: 4px;
padding-top: 0;
padding-right: 30px;
padding-left: 0;
// Not actually a component but things shared by settings components
.mx_UserSettingsDialog, .mx_RoomSettingsDialog {
width: 90vw;
max-width: 1000px;
// set the height too since tabbed view scrolls itself.
height: 80vh;
.mx_TabbedView {
top: 65px;
@ -38,13 +37,6 @@ limitations under the License.
.mx_Dialog_title {
text-align: center;
margin-top: 16px;
margin-bottom: 24px;
}
.mx_Dialog_fixedWidth {
max-width: 1000px;
width: 90vw;
}
}
}

4
src/components/structures/MatrixChat.js
View file

@ -597,8 +597,8 @@ export default React.createClass({
break;
case 'view_user_settings': {
const UserSettingsDialog = sdk.getComponent("dialogs.UserSettingsDialog");
Modal.createTrackedDialog('User settings', '', UserSettingsDialog, {}, 'mx_SettingsDialog',
/*isPriority=*/false, /*isStatic=*/true);
Modal.createTrackedDialog('User settings', '', UserSettingsDialog, {},
/*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
// View the welcome or home page if we need something to look at
this._viewSomethingBehindModal();

2
src/stores/RoomViewStore.js
View file

@ -120,7 +120,7 @@ class RoomViewStore extends Store {
const RoomSettingsDialog = sdk.getComponent("dialogs.RoomSettingsDialog");
Modal.createTrackedDialog('Room settings', '', RoomSettingsDialog, {
roomId: payload.room_id || this._state.roomId,
}, 'mx_SettingsDialog', /*isPriority=*/false, /*isStatic=*/true);
}, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
break;
}
}