diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift index 048313692..01e4d8bee 100644 --- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift +++ b/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift @@ -51,28 +51,28 @@ struct TimelineCellAppearance: Equatable { init(theme: VSTheme, showAvatar: Bool, fontSize: FontSize) { let actualFontSize = AppDefaults.actualFontSize(for: fontSize) - + let smallItemFontSize = floor(actualFontSize * 0.95) + let largeItemFontSize = floor(actualFontSize * 1.1) + self.cellPadding = theme.edgeInsets(forKey: "MainWindow.Timeline.cell.padding") self.feedNameColor = theme.color(forKey: "MainWindow.Timeline.cell.feedNameColor") - self.feedNameFont = NSFont.systemFont(ofSize: actualFontSize) + self.feedNameFont = NSFont.systemFont(ofSize: smallItemFontSize) self.dateColor = theme.color(forKey: "MainWindow.Timeline.cell.dateColor") - let actualDateFontSize = AppDefaults.actualFontSize(for: fontSize) - self.dateFont = NSFont.systemFont(ofSize: actualDateFontSize) + self.dateFont = NSFont.systemFont(ofSize: smallItemFontSize) self.dateMarginLeft = theme.float(forKey: "MainWindow.Timeline.cell.dateMarginLeft") self.titleColor = theme.color(forKey: "MainWindow.Timeline.cell.titleColor") - let titleFontSizeMultiplier = theme.float(forKey: "MainWindow.Timeline.cell.titleFontSizeMultiplier") - self.titleFont = NSFont.systemFont(ofSize: floor(actualFontSize * titleFontSizeMultiplier), weight: NSFont.Weight.semibold) + self.titleFont = NSFont.systemFont(ofSize: largeItemFontSize, weight: NSFont.Weight.semibold) self.titleBottomMargin = theme.float(forKey: "MainWindow.Timeline.cell.titleMarginBottom") self.textColor = theme.color(forKey: "MainWindow.Timeline.cell.textColor") - self.textFont = NSFont.systemFont(ofSize: actualFontSize) + self.textFont = NSFont.systemFont(ofSize: largeItemFontSize) self.textOnlyColor = theme.color(forKey: "MainWindow.Timeline.cell.textOnlyColor") - self.textOnlyFont = self.textFont - + self.textOnlyFont = NSFont.systemFont(ofSize: largeItemFontSize) + self.unreadCircleColor = theme.color(forKey: "MainWindow.Timeline.cell.unreadCircleColor") self.unreadCircleDimension = theme.float(forKey: "MainWindow.Timeline.cell.unreadCircleDimension") self.unreadCircleMarginRight = theme.float(forKey: "MainWindow.Timeline.cell.unreadCircleMarginRight") diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift index 95dd388e2..7e70e34ad 100644 --- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift +++ b/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift @@ -117,6 +117,6 @@ private func attributedTitleString(_ title: String, _ text: String, _ appearance return NSAttributedString(string: title, attributes: [NSAttributedStringKey.foregroundColor: appearance.titleColor, NSAttributedStringKey.font: appearance.titleFont]) } - return NSAttributedString(string: text, attributes: [NSAttributedStringKey.foregroundColor: appearance.textOnlyColor, NSAttributedStringKey.font: appearance.textFont]) + return NSAttributedString(string: text, attributes: [NSAttributedStringKey.foregroundColor: appearance.textOnlyColor, NSAttributedStringKey.font: appearance.textOnlyFont]) } diff --git a/Evergreen/Resources/DB5.plist b/Evergreen/Resources/DB5.plist index a59a0bdff..52de2341e 100644 --- a/Evergreen/Resources/DB5.plist +++ b/Evergreen/Resources/DB5.plist @@ -99,10 +99,8 @@ 222222 titleColor 222222 - titleFontSizeMultiplier - 1.1 titleMarginBottom - 1 + 2 unreadCircleColor #2db6ff unreadCircleDimension