felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-04 06:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

MESSENGER-3671 Merge FOSS 1.9.8

Browse Source 
Conflicts:
 - CommonConfiguration.swift
 - BuildSettings.swift
 - Generated/images.Swift
 - RoomMemberDetailsViewController.m
 - LiveLocationSharingViewModell
-  PinCodeEnterViewController.m
This commit is contained in:
Frank Rotermund
2022-10-05 15:47:27 +02:00
parent bcba73d558 375508a0e4
commit 4d1ead2479
744 changed files with 6999 additions and 3819 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Utils/EventFormatter.m
+2 -2
View File
@@ -469,8 +469,8 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
{
calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
// Use the secondary bg color to set the background color in the default CSS.
NSUInteger bgColor = [MXKTools rgbValueWithColor:ThemeService.shared.theme.headerBackgroundColor];
// Use the selected bg color to set the code block background color in the default CSS.
NSUInteger bgColor = [MXKTools rgbValueWithColor:ThemeService.shared.theme.selectedBackgroundColor];
self.defaultCSS = [NSString stringWithFormat:@" \
pre,code { \
background-color: #%06lX; \