Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Dashboard #36

Merged
merged 3 commits into from
Dec 19, 2023
Merged

Improve Dashboard #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ada152
feat: fix dashboard card in template
marcwieland95 Dec 15, 2023
d7854b4
fix: check if block `dashboard_paragraph` is not empty and only rende…
marcwieland95 Dec 18, 2023
18f1510
fix: remove absolute position of card link and make it simpler
marcwieland95 Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/Resources/views/dashboard.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@
{% endfor %}
</div>

<div class="m-4 md:m-8 p-4 bg-white drop-shadow-sm">
<p class="whatwedo-utility-paragraph mb-0">
{% block dashboard_paragraph %}
{% endblock %}
</p>
</div>
{% if block('dashboard_paragraph') is not empty %}
<div class="m-4 md:m-8 p-4 bg-white drop-shadow-sm">
<p class="whatwedo-utility-paragraph mb-0">
{% block dashboard_paragraph %}{% endblock %}
</p>
</div>
{% endif %}

</div>
{% endblock %}
6 changes: 3 additions & 3 deletions src/Resources/views/dashboard/cards.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="flex flex-col bg-neutral-300 p-8 pb-20 lg:pb-12 drop-shadow">
<div class="flex flex-col bg-neutral-300 drop-shadow">
{% if card.icon is defined %}
<div class="flex justify-between">
<div class="flex justify-between p-8">
<div>
{% endif %}

Expand All @@ -20,7 +20,7 @@
{% endif %}

{% if card.link is defined %}
<a href="{{ path(card.link) }}" class="absolute inset-x-0 bottom-0 px-8 py-4 bg-neutral-100/60 hover:bg-neutral-100/80 transition-colors">
<a href="{{ path(card.link) }}" class="px-8 py-4 bg-neutral-100/60 hover:bg-neutral-100/80 transition-colors">
<span class="font-semibold text-base text-black">{{ 'wwd.dashboard.to_overview'|trans }}</span>
</a>
{% endif %}
Expand Down