|
@@ -4255,7 +4255,6 @@ class ViewController: NSViewController {
|
|
|
self.topBarAuthButton = authButton
|
|
self.topBarAuthButton = authButton
|
|
|
[upgradeToProButton, authButton].forEach { rightTopBarCluster.addArrangedSubview($0) }
|
|
[upgradeToProButton, authButton].forEach { rightTopBarCluster.addArrangedSubview($0) }
|
|
|
|
|
|
|
|
- let welcome = makeLabel("Home", size: 15, color: secondaryText, weight: .medium, centered: false)
|
|
|
|
|
let timeTitle = makeLabel("--:--", size: 56, color: primaryText, weight: .bold, centered: true)
|
|
let timeTitle = makeLabel("--:--", size: 56, color: primaryText, weight: .bold, centered: true)
|
|
|
let dateTitle = makeLabel("-", size: 16, color: secondaryText, weight: .regular, centered: true)
|
|
let dateTitle = makeLabel("-", size: 16, color: secondaryText, weight: .regular, centered: true)
|
|
|
|
|
|
|
@@ -4532,7 +4531,7 @@ class ViewController: NSViewController {
|
|
|
[searchIcon, searchField, searchHintLabel].forEach {
|
|
[searchIcon, searchField, searchHintLabel].forEach {
|
|
|
searchPill.addSubview($0)
|
|
searchPill.addSubview($0)
|
|
|
}
|
|
}
|
|
|
- [welcome, timeTitle, dateTitle, actions, panel, panelHeader, meetingsStatus, meetingsDayNav, noMeeting, meetingsScrollView, refreshMeetingsButton, placeholder, settingsView, meetingsPageView, schedulerRoot].forEach {
|
|
|
|
|
|
|
+ [timeTitle, dateTitle, actions, panel, panelHeader, meetingsStatus, meetingsDayNav, noMeeting, meetingsScrollView, refreshMeetingsButton, placeholder, settingsView, meetingsPageView, schedulerRoot].forEach {
|
|
|
$0.translatesAutoresizingMaskIntoConstraints = false
|
|
$0.translatesAutoresizingMaskIntoConstraints = false
|
|
|
contentColumn.addSubview($0)
|
|
contentColumn.addSubview($0)
|
|
|
}
|
|
}
|
|
@@ -4601,10 +4600,7 @@ class ViewController: NSViewController {
|
|
|
searchField.centerYAnchor.constraint(equalTo: searchPill.centerYAnchor),
|
|
searchField.centerYAnchor.constraint(equalTo: searchPill.centerYAnchor),
|
|
|
authButton.heightAnchor.constraint(equalToConstant: 30),
|
|
authButton.heightAnchor.constraint(equalToConstant: 30),
|
|
|
|
|
|
|
|
- welcome.topAnchor.constraint(equalTo: contentColumn.topAnchor, constant: 18),
|
|
|
|
|
- welcome.centerXAnchor.constraint(equalTo: contentColumn.centerXAnchor),
|
|
|
|
|
-
|
|
|
|
|
- timeTitle.topAnchor.constraint(equalTo: welcome.bottomAnchor, constant: 12),
|
|
|
|
|
|
|
+ timeTitle.topAnchor.constraint(equalTo: contentColumn.topAnchor, constant: 20),
|
|
|
timeTitle.centerXAnchor.constraint(equalTo: contentColumn.centerXAnchor),
|
|
timeTitle.centerXAnchor.constraint(equalTo: contentColumn.centerXAnchor),
|
|
|
dateTitle.topAnchor.constraint(equalTo: timeTitle.bottomAnchor, constant: 6),
|
|
dateTitle.topAnchor.constraint(equalTo: timeTitle.bottomAnchor, constant: 6),
|
|
|
dateTitle.centerXAnchor.constraint(equalTo: contentColumn.centerXAnchor),
|
|
dateTitle.centerXAnchor.constraint(equalTo: contentColumn.centerXAnchor),
|
|
@@ -4762,7 +4758,7 @@ class ViewController: NSViewController {
|
|
|
|
|
|
|
|
timeLabel = timeTitle
|
|
timeLabel = timeTitle
|
|
|
dateLabel = dateTitle
|
|
dateLabel = dateTitle
|
|
|
- homeWelcomeLabel = welcome
|
|
|
|
|
|
|
+ homeWelcomeLabel = nil
|
|
|
homeTimeLabelView = timeTitle
|
|
homeTimeLabelView = timeTitle
|
|
|
homeDateLabelView = dateTitle
|
|
homeDateLabelView = dateTitle
|
|
|
homeActionsRow = actions
|
|
homeActionsRow = actions
|