discourse
/
discourse-calendar
mirror of https://github.com/discourse/discourse-calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: reduces visual noise of grouped events on mobile (#38)

This commit is contained in:
Joffrey JAFFEUX 2020-04-22 17:36:48 +02:00 committed by GitHub
parent cc193bf2ba
commit 3966e58c96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/javascripts/initializers/discourse-calendar.js.es6
View File

@ -389,13 +389,20 @@ function initializeDiscourseCalendar(api) {
const event = _buildEvent(detail); const event = _buildEvent(detail);
event.classNames = ["grouped-event"]; event.classNames = ["grouped-event"];
const site = api.container.lookup("site:main");
if (usernames.length > 3) { if (usernames.length > 3) {
event.title = 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) { } else if (usernames.length === 1) {
event.title = usernames[0]; event.title = usernames[0];
} else { } 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) { if (localEventNames.length > 1) {

3
assets/stylesheets/common/discourse-calendar.scss
View File

@ -124,8 +124,7 @@
} }
&.grouped-event { &.grouped-event {
background-color: none; background-color: $primary-low;
background: $secondary;
border: 1px solid $primary-low-mid; border: 1px solid $primary-low-mid;
color: $primary; color: $primary;