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

Merge pull request #2666 from matrix-org/bwindels/userview

Browse source 
Bring back user view
This commit is contained in:
Bruno Windels 2019-02-21 16:05:03 +01:00 • committed by GitHub
commit ab9bf4c0e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 137 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
res/css/_components.scss
View file

@ -10,6 +10,7 @@
@import "./structures/_HeaderButtons.scss";
@import "./structures/_HomePage.scss";
@import "./structures/_LeftPanel.scss";
@import "./structures/_MainSplit.scss";
@import "./structures/_MatrixChat.scss";
@import "./structures/_MyGroups.scss";
@import "./structures/_NotificationPanel.scss";

1
res/css/structures/_GroupView.scss
View file

@ -170,7 +170,6 @@ limitations under the License.
.mx_GroupView > .mx_MainSplit {
flex: 1;
display: flex;
}
.mx_GroupView_body {

21
res/css/structures/_MainSplit.scss Normal file
View file

@ -0,0 +1,21 @@
/*
Copyright 2019 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_MainSplit {
display: flex;
flex-direction: row;
min-width: 0;
}

1
res/css/structures/_RoomView.scss
View file

@ -77,7 +77,6 @@ limitations under the License.
.mx_RoomView .mx_MainSplit {
flex: 1 1 0;
display: flex;
}
.mx_RoomView_body {

7
res/css/views/rooms/_MemberInfo.scss
View file

@ -32,11 +32,12 @@ limitations under the License.
.mx_MemberInfo_cancel {
height: 16px;
padding: 10px 15px;
width: 16px;
padding: 10px 0 10px 10px;
cursor: pointer;
mask-image: url('$(res)/img/minimise.svg');
mask-repeat: no-repeat;
mask-position: center;
mask-position: 16px center;
background-color: $rightpanel-button-color;
}
@ -47,7 +48,7 @@ limitations under the License.
.mx_MemberInfo h2 {
font-size: 18px;
font-weight: 600;
margin: 16px 0;
margin: 16px 0 16px 15px;
}
.mx_MemberInfo_container {