diff --git a/CHANGELOG.md b/CHANGELOG.md index 6799bff0a..78e5b936d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - adds reservation context feature (for machine, training, space) - Fix a bug: event reserved places compute error +- Fix a bug: event canceled places error - [TODO DEPLOY] `rails fablab:es:build_stats` - [TODO DEPLOY] `rails fablab:maintenance:regenerate_statistics[2014,1]` - [TODO DEPLOY] `rails fablab:setup:build_places_cache` diff --git a/app/frontend/src/stylesheets/modules/form/form-select.scss b/app/frontend/src/stylesheets/modules/form/form-select.scss index 73aa63a33..746083bac 100644 --- a/app/frontend/src/stylesheets/modules/form/form-select.scss +++ b/app/frontend/src/stylesheets/modules/form/form-select.scss @@ -1,4 +1,5 @@ .form-select { + .rs__menu { z-index: 20; } .rs__menu .rs__menu-list { .rs__option { &--is-disabled { diff --git a/app/frontend/templates/events/show.html b/app/frontend/templates/events/show.html index 0f0183e5b..39fdbf45b 100644 --- a/app/frontend/templates/events/show.html +++ b/app/frontend/templates/events/show.html @@ -240,7 +240,7 @@