archive/kevinpapst_kimai2
0
0
Fork 0
mirror of https://github.com/kevinpapst/kimai2.git synced 2025-04-07 14:35:47 +00:00
Code Issues Projects Releases Wiki Activity

fix multi line bade rows

Browse source
This commit is contained in:
Kevin Papst 2022-02-26 19:57:19 +01:00
parent 9e62ea0321
commit 7199981889
3 changed files with 9 additions and 4 deletions

5
assets/sass/content.scss
View file

@ -26,6 +26,11 @@ td {
margin: 0;
}
}
/* table cells that contain badges (like the team or timesheet view)
and are multi-line entries the badges do not have margin between them */
&.badges {
line-height: 22px;
}
}
.label-gray {

6
templates/team/index.html.twig
View file

@ -15,9 +15,9 @@
{% else %}
{% set columns = {
'name': {'class': ''},
'teamlead': {'class': '', 'orderBy': false},
'user': {'class': 'd-xs-none', 'orderBy': false},
'name': {'class': 'w-25'},
'teamlead': {'class': 'badges', 'orderBy': false},
'user': {'class': 'd-none d-sm-table-cell badges', 'orderBy': false},
'actions': {'class': 'actions alwaysVisible'},
} %}

2
templates/timesheet/layout-listing.html.twig
View file

@ -34,7 +34,7 @@
'project': {'class': 'd-none d-lg-table-cell'},
'activity': {'class': 'd-none d-md-table-cell'},
'description': {'class': 'd-none'},
'tags': {'class': 'd-none', 'orderBy': false},
'tags': {'class': 'd-none badges', 'orderBy': false},
}) %}
{% for field in metaColumns %}
{% set columns = columns|merge({