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

Merge branch 'develop' into experimental

Browse source
This commit is contained in:
Bruno Windels 2018-10-26 15:33:39 +02:00
commit 2c039483c6
42 changed files with 469 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

5
res/css/views/rooms/_MemberList.scss
View file

@ -95,10 +95,6 @@ limitations under the License.
padding: 10px;
}
.mx_MemberList_outerWrapper {
}
.mx_MemberList_inviteIcon object {
pointer-events: none;
}
@ -124,4 +120,3 @@ limitations under the License.
.mx_MemberList_invite > :last-child {
margin-left: 25px;
}

4
res/css/views/rooms/_RoomPreviewBar.scss
View file

@ -56,3 +56,7 @@ limitations under the License.
.mx_RoomPreviewBar_warningIcon {
padding: 12px;
}
.mx_RoomPreviewBar_spinnerIntro {
margin-top: 50px;
}

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

@ -28,6 +28,13 @@ limitations under the License.
margin-right: 8px;
}
.mx_RoomSettings_devtoolsButton {
@mixin mx_DialogButton;
position: relative;
padding: 4px 1.5em;
margin-top: 8px;
}
.mx_RoomSettings_upgradeButton,
.mx_RoomSettings_leaveButton:hover,
.mx_RoomSettings_unbanButton:hover {