diff --git a/app/Domain/Tickets/Js/ticketsController.js b/app/Domain/Tickets/Js/ticketsController.js index a525c5e5c..2921ec7ee 100644 --- a/app/Domain/Tickets/Js/ticketsController.js +++ b/app/Domain/Tickets/Js/ticketsController.js @@ -102,19 +102,19 @@ export const initGanttChart = function (tasks, viewMode, readonly) { var popUpHTML = '
'; if (task.projectName !== undefined) { - popUpHTML += '

' + task.projectName + '

'; + popUpHTML += '

' + task.projectName + '

'; } - popUpHTML += '' + task.type + ' #' + task.id + ' '; + popUpHTML += '

' + task.type + ' #' + task.id + '

'; if (task.type === 'milestone') { - popUpHTML += '

' + htmlEntities(task.name) + '


' + + popUpHTML += '

' + htmlEntities(task.name) + '


' + '

' + window.leantime.i18n.__("text.expected_to_finish_by") + ' ' + dateTime + '
' + '' + Math.round(task.progress) + '%

' + - ' ' + window.leantime.i18n.__("links.edit_milestone") + ' | ' + - ' ' + window.leantime.i18n.__("links.view_todos") + ' '; + ' ' + window.leantime.i18n.__("links.edit_milestone") + ' | ' + + ' ' + window.leantime.i18n.__("links.view_todos") + ' '; } else { - popUpHTML += '

' + htmlEntities(task.name) + '


' + - ' ' + window.leantime.i18n.__("links.edit_todo") + ' '; + popUpHTML += '

' + htmlEntities(task.name) + '


' + + ' ' + window.leantime.i18n.__("links.edit_todo") + ' '; } popUpHTML += '
'; @@ -173,11 +173,11 @@ export const initGanttChart = function (tasks, viewMode, readonly) { // dates and progress value var end_date = task._end; return '
' + - '' + task.projectName + '' + - '

' + htmlEntities(task.name) + '


' + + '

' + task.projectName + '

' + + '

' + htmlEntities(task.name) + '


' + '

' + window.leantime.i18n.__("text.expected_to_finish_by") + ' ' + end_date + '
' + '' + Math.round(task.progress) + '%

' + - ' ' + window.leantime.i18n.__("links.view_todos") + ' ' + + ' ' + window.leantime.i18n.__("links.view_todos") + ' ' + '
'; }, diff --git a/public/assets/css/components/gantt-overwrites.css b/public/assets/css/components/gantt-overwrites.css index b363a2688..ee22378bb 100644 --- a/public/assets/css/components/gantt-overwrites.css +++ b/public/assets/css/components/gantt-overwrites.css @@ -13,6 +13,7 @@ body .gantt-container { .gantt .bar-label { text-anchor: start; + font-weight: normal; } body .gantt .bar-label, @@ -44,10 +45,25 @@ body .gantt #details .details-container { background-color:var(--secondary-background); padding:10px; box-shadow:var(--regular-shadow); - margin-left: -10px; + margin-left: -5px; opacity:0; min-width:100px; max-width:300px; + border-radius:var(--box-radius); + font-size: small; + +} + +.gantt-container .popup-wrapper h2 { + font-size: 1.1rem; + margin-bottom: 0.5rem; + font-weight: 500; +} + +.gantt-container .popup-wrapper h3 { + font-size: 0.9rem; + margin-bottom: 0.5rem; + font-weight: 300; } .gantt-container .bar-wrapper {