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

Corrige affichage explication congés restants #444

Merged
merged 1 commit into from
Jul 12, 2024
Merged

Corrige affichage explication congés restants #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 0 additions & 17 deletions src/assets/styles/defaults.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,3 @@ fieldset {
dialog {
margin: auto;
}

:popover-open {
position: absolute;
inset: unset;
margin: var(--w);
white-space: wrap;
border: 1px solid var(--border-default);
border-radius: var(--radius-sm);
box-shadow: var(--shadow-default);
padding: var(--w);
font-weight: normal;
text-transform: none;
}

[popovertarget]:focus {
outline: solid 2px;
}
4 changes: 0 additions & 4 deletions src/assets/styles/utilities/placement.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@
display: grid;
place-items: center;
}

.pc-relative {
position: relative;
}
10 changes: 10 additions & 0 deletions src/assets/styles/utilities/text.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,13 @@
.pc-bold {
font-weight: bold;
}

.pc-text--default {
font-size: var(--font-size-default);
font-weight: normal;
text-transform: none;
}

.pc-text--small {
font-size: var(--font-size-sm);
}
19 changes: 4 additions & 15 deletions src/templates/pages/leave_requests/overview/days_remaining_column_header.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
<span>
{{ 'leaves-overview-daysRemaining'|trans }}
</span>

<span class="pc-relative">
<button
popovertarget="leaves-explanation"
class="pc-btn pc-btn--secondary pc-btn--circle"
title="{{ 'leaves-overview-daysRemaining-showExplanation'|trans }}"
aria-label="{{ 'leaves-overview-daysRemaining-showExplanation'|trans }}"
>i</button>

<div id="leaves-explanation" popover>
{{ 'leaves-overview-daysRemaining-explanation'|trans({ daysPerYear: daysPerYear }) }}
</div>
{{ 'leaves-overview-daysRemaining'|trans }}
<br>
<span class="pc-text--default pc-text--small">
({{ 'leaves-overview-daysRemaining-explanation'|trans({ daysPerYear: daysPerYear }) }})
</span>
4 changes: 2 additions & 2 deletions src/translations/fr-FR.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,11 @@ leaves-overview-daysRemaining-value = {$daysRemaining ->
[1] 1 jour
*[other] {$daysRemaining} jours
}
leaves-overview-daysRemaining-explanation = Estimation sur une base de {$daysPerYear ->
leaves-overview-daysRemaining-explanation = {$daysPerYear ->
[0] 0
[1] 1 jour
*[other] {$daysPerYear} jours
} par an, hors congés exceptionnels
} par an, réinitialisé le 01/06, hors congés exceptionnels

payroll-elements-title = Éléments de paie
payroll-elements-page-title = Éléments de paie {DATETIME($date, month: "long", year: "numeric")}
Expand Down
Loading