Merge branch 'element_4087' into element_4134

# Conflicts:
#	CHANGES.rst
This commit is contained in:
Gil Eluard
2021-04-07 21:02:24 +02:00
2 changed files with 4 additions and 2 deletions
+2 -2
View File
@@ -288,7 +288,7 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
{
[super finalizeInit];
self.resizeComposerAnimationDuration = 0.15;
self.resizeComposerAnimationDuration = 0.05;
// Setup `MXKViewControllerHandling` properties
self.enableBarTintColorStatusChange = NO;
@@ -469,7 +469,7 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
self.scrollToBottomButton.layer.shadowRadius = 6;
self.scrollToBottomButton.layer.shadowOffset = CGSizeMake(0, 4);
self.inputBackgroundView.backgroundColor = [ThemeService.shared.theme.searchBackgroundColor colorWithAlphaComponent:0.98];
self.inputBackgroundView.backgroundColor = [ThemeService.shared.theme.backgroundColor colorWithAlphaComponent:0.98];
if ([ThemeService.shared.themeId isEqualToString:@"light"])
{