From 3966e58c9660d341de24314f84a6fb6ccfce32a4 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Wed, 22 Apr 2020 17:36:48 +0200 Subject: [PATCH] FIX: reduces visual noise of grouped events on mobile (#38) --- .../initializers/discourse-calendar.js.es6 | 11 +++++++++-- assets/stylesheets/common/discourse-calendar.scss | 3 +-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/assets/javascripts/initializers/discourse-calendar.js.es6 b/assets/javascripts/initializers/discourse-calendar.js.es6 index fe3ff05b..2299952c 100644 --- a/assets/javascripts/initializers/discourse-calendar.js.es6 +++ b/assets/javascripts/initializers/discourse-calendar.js.es6 @@ -389,13 +389,20 @@ function initializeDiscourseCalendar(api) { const event = _buildEvent(detail); event.classNames = ["grouped-event"]; + const site = api.container.lookup("site:main"); + if (usernames.length > 3) { event.title = - `(${usernames.length}) ` + I18n.t("discourse_calendar.holiday"); + site && site.mobileView + ? usernames.length + : `(${usernames.length}) ` + I18n.t("discourse_calendar.holiday"); } else if (usernames.length === 1) { event.title = usernames[0]; } else { - event.title = `(${usernames.length}) ` + usernames.slice(0, 3).join(", "); + event.title = + site && site.mobileView + ? usernames.length + : `(${usernames.length}) ` + usernames.slice(0, 3).join(", "); } if (localEventNames.length > 1) { diff --git a/assets/stylesheets/common/discourse-calendar.scss b/assets/stylesheets/common/discourse-calendar.scss index 772774ba..604b19d6 100644 --- a/assets/stylesheets/common/discourse-calendar.scss +++ b/assets/stylesheets/common/discourse-calendar.scss @@ -124,8 +124,7 @@ } &.grouped-event { - background-color: none; - background: $secondary; + background-color: $primary-low; border: 1px solid $primary-low-mid; color: $primary;