Merge pull request #5282 from turt2live/travis/unset_avatar

CSS for remove avatar buttons
This commit is contained in:
Matthew Hodgson 2017-10-14 22:11:02 +01:00 committed by GitHub
commit 6f81142bde
2 changed files with 18 additions and 1 deletions

View File

@ -252,6 +252,16 @@ input.mx_UserSettings_phoneNumberField {
display: none; display: none;
} }
.mx_UserSettings_avatarPicker_imgContainer {
display: inline-block;
}
.mx_UserSettings_avatarPicker_remove {
display: inline-block;
float: right;
margin-right: -15px;
}
.mx_UserSettings_advanced_spoiler, .mx_UserSettings_advanced_spoiler,
.mx_UserSettings_link { .mx_UserSettings_link {
cursor: pointer; cursor: pointer;

View File

@ -138,10 +138,17 @@ limitations under the License.
.mx_RoomHeader_name, .mx_RoomHeader_name,
.mx_RoomHeader_avatar, .mx_RoomHeader_avatar,
.mx_RoomHeader_avatarPicker, .mx_RoomHeader_avatarPicker,
.mx_RoomHeader_avatarPicker_edit { .mx_RoomHeader_avatarPicker_edit,
.mx_RoomHeader_avatarPicker_remove {
cursor: pointer; cursor: pointer;
} }
.mx_RoomHeader_avatarPicker_remove {
position: absolute;
top: 10px;
left: 45px;
}
.mx_RoomHeader_name:hover div:not(.mx_RoomHeader_editable) { .mx_RoomHeader_name:hover div:not(.mx_RoomHeader_editable) {
color: $accent-color; color: $accent-color;
} }