Merge branch 'develop' into travis/message-states

2021-03-05 09:29:39 -07:00
parent 08d35073de 06ad9f0fb8
commit 017c2af663
47 changed files with 2360 additions and 143 deletions
@@ -67,9 +67,6 @@ $groupFilterPanel-bg-color: rgba(232, 232, 232, 0.77);
 // used by RoomDirectory permissions
 $plinth-bg-color: $secondary-accent-color;

-// used by RoomDropTarget
-$droptarget-bg-color: rgba(255,255,255,0.5);
-
 // used by AddressSelector
 $selected-color: $secondary-accent-color;