Merge branch 'dev' into 'master'

Fix 3.2.1c

See merge request TheGamecraft/c-cms!58
This commit is contained in:
Mathieu Lagace
2019-09-04 01:33:44 +00:00
3 changed files with 3 additions and 3 deletions

View File

@@ -7,7 +7,7 @@
overflow: hidden;
}
.activity-body-small {
.activitybodysmall {
height: 5rem;
overflow: hidden;
}

View File

@@ -7,7 +7,7 @@
overflow: hidden;
}
.activity-body-small {
.activitybodysmall {
height: 5rem;
overflow: hidden;
}

View File

@@ -7,7 +7,7 @@
</div>
<div class="card-body">
<h4 class="card-title">{{$activity->name}}</h4>
<div class="activity-body-small">{!! $activity->public_body !!}</div>
<div style="height: 4rem;overflow: hidden;">{!! $activity->public_body !!}</div>
<a name="activity" id="activity" class="btn btn-primary" href="/activity/{{$activity->id}}" role="button">Plus d'information</a>
</div>
</div>