Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-07-03 15:36:14 +00:00
Code Issues Actions Projects Releases Wiki Activity

Update styles and markup for badges and ticket events

Browse Source 
Updated the SCSS for badge components, including the introduction of a margin and specific font-weight for user-group badges. Additionally, changes have been made to the TicketApp store to comment out a specific condition. A few updates were made to the twig files in the ChillTicketBundle and ChillMainBundle to reflect these style changes.
This commit is contained in:
Julien Fastré 2024-06-03 11:13:49 +02:00
parent ac4e2e5bf2
commit 643028ffd6
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig
View File

@ -1 +1 @@
<span class="badge" style="color: {{ user_group.foregroundColor }}; background-color: {{ user_group.backgroundColor }};">{{ user_group.label|localize_translatable_string }}</span> <span class="badge-user-group" style="color: {{ user_group.foregroundColor }}; background-color: {{ user_group.backgroundColor }};">{{ user_group.label|localize_translatable_string }}</span>

7
src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
View File

@ -3,8 +3,11 @@
*/ */
span.badge-user, span.badge-user,
span.badge-user-group,
span.badge-person, span.badge-person,
span.badge-thirdparty { span.badge-thirdparty {
margin-top: 0.2rem;
margin-bottom: 0.2rem;
display: inline-block; display: inline-block;
padding: 0 0.5em !important; padding: 0 0.5em !important;
background-color: $white; background-color: $white;
@ -18,6 +21,10 @@ span.badge-thirdparty {
} }
} }
span.badge-user-group {
font-weight: 600;
}
span.badge-user { span.badge-user {
border-bottom-width: 1px; border-bottom-width: 1px;
&.system { &.system {

3
src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
View File

@ -47,10 +47,11 @@ export const moduleTicket: Module<State, RootState> = {
if (!result[datetime]) { if (!result[datetime]) {
result[datetime] = []; result[datetime] = [];
} }
/*
if (item.event_type === "add_addressee") { if (item.event_type === "add_addressee") {
result[datetime].push(item); result[datetime].push(item);
} }
*/
return result; return result;
}, },
{} as any {} as any

4
src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
View File

@ -66,9 +66,11 @@
<div class="wl-col list"> <div class="wl-col list">
{% for d in ticket.currentAddressee %} {% for d in ticket.currentAddressee %}
{% if d.isUser is defined and d.isUser %} {% if d.isUser is defined and d.isUser %}
<span class="badge-user">
{{ d|chill_entity_render_box }} {{ d|chill_entity_render_box }}
</span>
{% elseif d.isUserGroup is defined and d.isUserGroup %} {% elseif d.isUserGroup is defined and d.isUserGroup %}
{{ d|chill_entity_render_box }} {{ d|chill_entity_render_box() }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>