From c90ee9ece5bb590ccb896bc4080e7711faecc87e Mon Sep 17 00:00:00 2001 From: kdeterme Date: Mon, 24 Aug 2026 19:00:19 +0200 Subject: [PATCH] style: add status-on_pause badge styling and simplify calendar marker rendering to solid colors --- loko/common/static/common/base_style.css | 5 +++- .../calendar/interventions_calendar.css | 8 +++++ .../calendar/interventions_calendar.js | 30 +++++-------------- .../interventions/detail/styles.html | 9 ++++++ 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/loko/common/static/common/base_style.css b/loko/common/static/common/base_style.css index 60b0fda..aa296a7 100644 --- a/loko/common/static/common/base_style.css +++ b/loko/common/static/common/base_style.css @@ -322,7 +322,10 @@ label, color: #ffffff !important; } -.badge.status-on_pause { +.badge.status-on_pause, +.badge.bg-warning.status-on_pause, +.badge.text-bg-warning.status-on_pause, +.badge[class*="status-on_pause"] { background-color: #6b226e !important; color: #ffffff !important; } diff --git a/loko/interventions/static/interventions/calendar/interventions_calendar.css b/loko/interventions/static/interventions/calendar/interventions_calendar.css index ed9ffc4..8af292d 100644 --- a/loko/interventions/static/interventions/calendar/interventions_calendar.css +++ b/loko/interventions/static/interventions/calendar/interventions_calendar.css @@ -61,6 +61,14 @@ .vis-item.status-archived { background-color: #343a40; border-color: #23272b; color: #fff; } .vis-item.status-canceled { background-color: #6c757d; border-color: #5a6268; color: #fff; } +.badge.status-on_pause, +.badge.bg-warning.status-on_pause, +.badge.text-bg-warning.status-on_pause, +.badge[class*="status-on_pause"] { + background-color: #6b226e !important; + color: #ffffff !important; +} + .canvas-timeline { border: 1px solid var(--bs-border-color, #e2e8f0); diff --git a/loko/interventions/static/interventions/calendar/interventions_calendar.js b/loko/interventions/static/interventions/calendar/interventions_calendar.js index 796042f..5af5e42 100644 --- a/loko/interventions/static/interventions/calendar/interventions_calendar.js +++ b/loko/interventions/static/interventions/calendar/interventions_calendar.js @@ -1649,24 +1649,16 @@ document.addEventListener('DOMContentLoaded', function () { ctx.restore(); } - // Dégradé sphérique 3D + // Pastille plate avec la couleur canonique du statut ctx.save(); - const grad = ctx.createRadialGradient( - sh.x - 2.5, trackY - 2.5, 1, - sh.x, trackY, sphereRadius - ); - grad.addColorStop(0, '#ffffff'); - grad.addColorStop(0.35, sphereColor); - grad.addColorStop(1, shadeColor(sphereColor, -28)); - - ctx.fillStyle = grad; + ctx.fillStyle = sphereColor; ctx.beginPath(); ctx.arc(sh.x, trackY, sphereRadius, 0, Math.PI * 2); ctx.fill(); - // Contour blanc fin et soigné - ctx.strokeStyle = 'rgba(255, 255, 255, 0.9)'; - ctx.lineWidth = 1.2; + // Contour blanc net et soigné + ctx.strokeStyle = '#ffffff'; + ctx.lineWidth = 1.5; ctx.stroke(); ctx.restore(); @@ -2250,21 +2242,13 @@ document.addEventListener('DOMContentLoaded', function () { } ctx.save(); - const grad = ctx.createRadialGradient( - sh.x - 2.5, trackY - 2.5, 1, - sh.x, trackY, sphereRadius - ); - grad.addColorStop(0, '#ffffff'); - grad.addColorStop(0.35, sphereColor); - grad.addColorStop(1, shadeColor(sphereColor, -28)); - - ctx.fillStyle = grad; + ctx.fillStyle = sphereColor; ctx.beginPath(); ctx.arc(sh.x, trackY, sphereRadius, 0, Math.PI * 2); ctx.fill(); ctx.strokeStyle = '#ffffff'; - ctx.lineWidth = 1.2; + ctx.lineWidth = 1.5; ctx.stroke(); ctx.restore(); } diff --git a/loko/interventions/templates/interventions/detail/styles.html b/loko/interventions/templates/interventions/detail/styles.html index 20dcd0c..faa356a 100644 --- a/loko/interventions/templates/interventions/detail/styles.html +++ b/loko/interventions/templates/interventions/detail/styles.html @@ -457,4 +457,13 @@ white-space: normal; word-wrap: break-word; } + + /* Statuts dans les badges de l'intervention */ + .badge.status-on_pause, + .badge.bg-warning.status-on_pause, + .badge.text-bg-warning.status-on_pause, + .badge[class*="status-on_pause"] { + background-color: #6b226e !important; + color: #ffffff !important; + }