diff --git a/CHANGELOG.md b/CHANGELOG.md index 021b7413a..1db3588d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## next release +- Fix a bug: Long words overflow from homepage's events blocks - Fix a bug: ActiveRecord::RecordNotFound when running rake task fix:recursive_events_over_DST ## v2.5.11 2017 September 7 diff --git a/app/assets/stylesheets/app.layout.scss b/app/assets/stylesheets/app.layout.scss index 3ad8383b8..0c8946e00 100644 --- a/app/assets/stylesheets/app.layout.scss +++ b/app/assets/stylesheets/app.layout.scss @@ -619,3 +619,9 @@ body.container{ .calendar-filter-aside { padding: 20px; } + +.home-events { + .event-description { + overflow: hidden; + } +} \ No newline at end of file diff --git a/app/assets/templates/home.html.erb b/app/assets/templates/home.html.erb index d851693ab..2109fd532 100644 --- a/app/assets/templates/home.html.erb +++ b/app/assets/templates/home.html.erb @@ -79,7 +79,7 @@ -
+

{{ 'fablab_s_next_events' | translate }} {{ 'every_events' | translate }}

@@ -100,7 +100,7 @@ {{event.category.name}}
-

+