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

Merge branch 'develop' into hs/bridge-info

Browse source
This commit is contained in:
Will Hunt 2019-12-30 17:09:05 +01:00 • committed by GitHub
commit 0a8cc416bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
203 changed files with 5331 additions and 2496 deletions
Download patch file Download diff file Expand all files Collapse all files

9
res/css/views/dialogs/_RoomSettingsDialog.scss
View file

@ -48,6 +48,12 @@ limitations under the License.
padding-right: 80px;
}
// show a different AvatarSetting placeholder for RoomProfileSettings which is basically a clone of ProfileSettings
.mx_RoomSettingsDialog .mx_AvatarSetting_avatar .mx_AvatarSetting_avatarPlaceholder::before {
mask: url("$(res)/img/feather-customised/image.svg");
mask-repeat: no-repeat;
mask-size: 36px;
mask-position: center;
.mx_RoomSettingsDialog_BridgeList {
padding: 0;
@ -58,4 +64,5 @@ limitations under the License.
padding: 0;
margin: 0;
border-bottom: 1px solid $panel-divider-color;
}
}