From 04694cef4ce39c7e321ea3a5443e972f1de567ce Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Sun, 18 Feb 2018 20:28:31 -0800
Subject: [PATCH] Tweak timeline font sizes a bit.

---
 .../Timeline/Cell/TimelineCellAppearance.swift | 18 +++++++++---------
 .../Timeline/Cell/TimelineCellData.swift       |  2 +-
 Evergreen/Resources/DB5.plist                  |  4 +---
 3 files changed, 11 insertions(+), 13 deletions(-)

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 @@
 					<string>222222</string>
 					<key>titleColor</key>
 					<string>222222</string>
-					<key>titleFontSizeMultiplier</key>
-					<real>1.1</real>
 					<key>titleMarginBottom</key>
-					<integer>1</integer>
+					<integer>2</integer>
 					<key>unreadCircleColor</key>
 					<string>#2db6ff</string>
 					<key>unreadCircleDimension</key>