c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-21 10:49:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
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
parent 245c357b7a ee6b71534a
commit 9a65920265
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/custom.css vendored
View File

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

2
resources/custom.css vendored
View File

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

2
resources/views/layouts/public/activity.blade.php
View File

@@ -7,7 +7,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<h4 class="card-title">{{$activity->name}}</h4> <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> <a name="activity" id="activity" class="btn btn-primary" href="/activity/{{$activity->id}}" role="button">Plus d'information</a>
</div> </div>
</div> </div>