Merge branch 'master' into develop
# Conflicts: # res/css/views/avatars/_BaseAvatar.pcss
This commit is contained in:
@@ -99,6 +99,11 @@ limitations under the License.
|
||||
margin: 0 auto;
|
||||
transition: 0.5s;
|
||||
|
||||
.mx_BaseAvatar {
|
||||
/* Override the calculated font-size so that the letter isn't tiny */
|
||||
font-size: 4rem;
|
||||
}
|
||||
|
||||
.mx_BaseAvatar,
|
||||
.mx_BaseAvatar img {
|
||||
width: 100%;
|
||||
@@ -250,6 +255,11 @@ limitations under the License.
|
||||
max-width: 72px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.mx_BaseAvatar {
|
||||
/* Override the calculated font-size so that the letter isn't tiny */
|
||||
font-size: 2rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user