diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c4e8836..45528ab2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,17 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [2.1.3] - Unreleased ### Changed + ### Added -- Add `clientonly` script to start only the electron client for a remote server +- Add `clientonly` script to start only the electron client for a remote server. +- Add symbol and color properties of event when `CALENDAR_EVENTS` notification is broadcasted from `default/calendar` module. + ### Updated + ### Fixed +- Fixed issue with incorrect allignment of analog clock when displayed in the center column of the MM + ## [2.1.2] - 2017-07-01 ### Changed diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 9ab864b9..a5716d77 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -81,7 +81,7 @@ Module.register("calendar", { case 24: { moment.updateLocale(config.language, { longDateFormat: { - LT: "hh:mm" + LT: "HH:mm" } }); break; @@ -522,6 +522,8 @@ Module.register("calendar", { var calendar = this.calendarData[url]; for (var e in calendar) { var event = cloneObject(calendar[e]); + event.symbol = this.symbolsForUrl(url); + event.color = this.colorForUrl(url); delete event.url; eventList.push(event); } diff --git a/modules/default/clock/clock_styles.css b/modules/default/clock/clock_styles.css index dd9eb0f8..1df9bf83 100644 --- a/modules/default/clock/clock_styles.css +++ b/modules/default/clock/clock_styles.css @@ -1,5 +1,5 @@ .clockCircle { - margin: 0; + margin: 0 auto; position: relative; border-radius: 50%; background-size: 100%;