From d88b3ebaac7fe7f9bc09119e14e2d68676f59eb4 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Tue, 17 Dec 2019 21:39:49 -0800 Subject: [PATCH] Google Calendar subheading now obey global subheading color (#798) This can still be over-written by setting: ``` gcal: colors: day: "orange::b" ``` explicitly in your gCal configuration. Signed-off-by: Chris Cummer --- modules/gcal/display.go | 3 +-- modules/gcal/settings.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/gcal/display.go b/modules/gcal/display.go index dc693123..1885f19f 100644 --- a/modules/gcal/display.go +++ b/modules/gcal/display.go @@ -83,8 +83,7 @@ func (widget *Widget) dayDivider(event, prevEvent *CalEvent) string { eventStartDay := toMidnight(event.Start()) if !eventStartDay.Equal(prevStartDay) { - - return fmt.Sprintf("[%s::b]", + return fmt.Sprintf("[%s]", widget.settings.colors.day) + event.Start().Format(utils.FullDateFormat) + "\n" diff --git a/modules/gcal/settings.go b/modules/gcal/settings.go index 3f5abf24..db7fa6b5 100644 --- a/modules/gcal/settings.go +++ b/modules/gcal/settings.go @@ -58,7 +58,7 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *co calendarReadLevel: ymlConfig.UString("calendarReadLevel", "writer"), } - settings.colors.day = ymlConfig.UString("colors.day", "forestgreen") + settings.colors.day = ymlConfig.UString("colors.day", settings.common.Colors.Subheading) settings.colors.description = ymlConfig.UString("colors.description", "white") // settings.colors.eventTime is a new feature introduced via issue #638. Prior to this, the color of the event // time was (unintentionally) customized via settings.colors.description. To maintain backwards compatibility