Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux'

# Conflicts:
#   res/css/views/rooms/_RoomSublist2.scss
This commit is contained in:
Bruno Windels 2020-07-14 09:26:04 +00:00
commit 106c91aec0
42 changed files with 104 additions and 164 deletions

View file

@ -48,15 +48,15 @@ limitations under the License.
}
&.mx_NotificationBadge_2char {
width: 16px;
height: 16px;
border-radius: 16px;
width: $font-16px;
height: $font-16px;
border-radius: $font-16px;
}
&.mx_NotificationBadge_3char {
width: 26px;
height: 16px;
border-radius: 16px;
width: $font-26px;
height: $font-16px;
border-radius: $font-16px;
}
// The following is the floating badge