Merge branch 'develop' into feature/padLockInviteOnly

This commit is contained in:
Travis Ralston
2020-02-24 09:50:06 -07:00
138 changed files with 4634 additions and 1211 deletions
@@ -32,9 +32,9 @@ limitations under the License.
width: 4px;
height: 4px;
border-radius: 16px;
overflow: hidden;
background-color: $secondary-accent-color;
border: 6px solid $accent-color;
pointer-events: none;
}
.mx_TopUnreadMessagesBar_scrollUp {
+5 -4
View File
@@ -31,14 +31,15 @@ limitations under the License.
margin-left: -12px;
}
.mx_WhoIsTypingTile_avatars .mx_BaseAvatar_image {
border: 1px solid $primary-bg-color;
}
.mx_WhoIsTypingTile_avatars .mx_BaseAvatar_initial {
padding-top: 1px;
}
.mx_WhoIsTypingTile_avatars .mx_BaseAvatar {
border: 1px solid $primary-bg-color;
border-radius: 40px;
}
.mx_WhoIsTypingTile_remainingAvatarPlaceholder {
position: relative;
display: inline-block;