From 41838a913c7701dc8d079064f6e8d9a2670dc005 Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Mon, 20 Jan 2025 11:53:27 +0530 Subject: [PATCH 1/5] fix: update styling --- src/styles/gantt.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/styles/gantt.css b/src/styles/gantt.css index 419d6f8..088fab7 100644 --- a/src/styles/gantt.css +++ b/src/styles/gantt.css @@ -114,13 +114,13 @@ & .current-upper { position: sticky; left: 0 !important; - padding: 0 calc(var(--gv-lower-header-height) * 0.33); + padding: 0 15px; background: white; } & .side-header { position: sticky; - top: 5px; + top: 0; right: 0; float: right; @@ -129,8 +129,8 @@ font-weight: 400; width: max-content; margin-left: auto; - padding-right: 5px; - padding-top: 5px; + padding-right: 15px; + padding-top: 10px; background: var(--g-header-background); } @@ -144,14 +144,14 @@ height: 1.75rem; border-radius: 0.5rem; border: none; - padding: 0 0.5rem; + padding: 5px 8px; color: var(--g-text-dark); position: sticky; - margin: 5px; font-size: 14px; - line-height: 1.15; letter-spacing: 0.02em; font-weight: 420; + height: 20px; + box-sizing: content-box; &:last-child { margin-right: 0; From d53266f96cf5dfa7b33d14314e02c1788e2fb2b2 Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Mon, 20 Jan 2025 12:03:03 +0530 Subject: [PATCH 2/5] fix: dropdown styles --- src/styles/gantt.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/styles/gantt.css b/src/styles/gantt.css index 088fab7..e5ba2a1 100644 --- a/src/styles/gantt.css +++ b/src/styles/gantt.css @@ -141,7 +141,6 @@ background-color: var(--g-actions-background); text-align: -webkit-center; text-align: center; - height: 1.75rem; border-radius: 0.5rem; border: none; padding: 5px 8px; @@ -153,6 +152,8 @@ height: 20px; box-sizing: content-box; + margin-right: 5px; + &:last-child { margin-right: 0; } @@ -163,9 +164,9 @@ } & .side-header select { - padding: 0; - padding-right: 1rem; - width: 85px; + padding-right: 1.25rem; + width: 50px; + padding-left: 4px; } & .date-range-highlight { From 4d297bb7f82d5a2277730658b5ec08c4713c2234 Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Wed, 22 Jan 2025 13:01:26 +0530 Subject: [PATCH 3/5] fix: improved ui --- src/index.js | 4 ++-- src/styles/gantt.css | 11 ++++++----- src/styles/light.css | 7 ++++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/index.js b/src/index.js index 2f92243..6602861 100644 --- a/src/index.js +++ b/src/index.js @@ -240,7 +240,7 @@ export default class Gantt { this.setup_dates(maintain_pos); this.render(); if (maintain_pos) { - this.$container.scrollLeft =old_pos; + this.$container.scrollLeft = old_pos; this.options.scroll_to = old_scroll_op; } this.trigger_event('view_change', [mode]); @@ -846,7 +846,7 @@ export default class Gantt { last_date, this.options.language, ), - upper_y: 15, + upper_y: 17, lower_y: this.options.upper_header_height + 5, }; } diff --git a/src/styles/gantt.css b/src/styles/gantt.css index e5ba2a1..5d5da89 100644 --- a/src/styles/gantt.css +++ b/src/styles/gantt.css @@ -75,6 +75,7 @@ position: sticky; top: 0; left: 0; + border-bottom: 1px solid var(--g-row-border-color); z-index: 1000; } @@ -106,7 +107,7 @@ position: absolute; width: fit-content; font-weight: 500; - font-size: 16px; + font-size: 14px; color: var(--g-text-dark); height: calc(var(--gv-lower-header-height) * 0.66); } @@ -114,7 +115,7 @@ & .current-upper { position: sticky; left: 0 !important; - padding: 0 15px; + padding-left: 17px; background: white; } @@ -129,9 +130,10 @@ font-weight: 400; width: max-content; margin-left: auto; - padding-right: 15px; + padding-right: 10px; padding-top: 10px; background: var(--g-header-background); + display: flex; } & .side-header * { @@ -145,7 +147,6 @@ border: none; padding: 5px 8px; color: var(--g-text-dark); - position: sticky; font-size: 14px; letter-spacing: 0.02em; font-weight: 420; @@ -325,7 +326,7 @@ cursor: pointer; & .bar { - outline: 1px solid black; + outline: 1px solid var(--g-row-border-color); border-radius: 3px; } diff --git a/src/styles/light.css b/src/styles/light.css index 1b3d7c8..1b1be11 100644 --- a/src/styles/light.css +++ b/src/styles/light.css @@ -1,9 +1,9 @@ :root { - --g-arrow-color: #d7b15b; + --g-arrow-color: #1f2937; --g-bar-color: #fff; --g-bar-border: #fff; - --g-tick-color-thick: #e0e0e0; - --g-tick-color: #ebeef0; + --g-tick-color-thick: #e2e8f0; + --g-tick-color: #f1f5f9; --g-actions-background: #f3f3f3; --g-border-color: #ebeff2; --g-text-muted: #7c7c7c; @@ -15,6 +15,7 @@ --g-expected-progress: #c4c4e9; --g-header-background: #fff; --g-row-color: #fdfdfd; + --g-row-border-color: #cbd5e1; --g-today-highlight: #37352f; --g-popup-actions: #ebeff2; --g-weekend-highlight-color: #f7f7f7; From 0e2c8dadbeb1fd59584013e60353392e328766ce Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Thu, 23 Jan 2025 11:44:34 +0530 Subject: [PATCH 4/5] fix: stylistic issue --- src/bar.js | 13 ++++++------- src/styles/gantt.css | 3 --- src/styles/light.css | 6 +++--- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/bar.js b/src/bar.js index 490b165..3701211 100644 --- a/src/bar.js +++ b/src/bar.js @@ -109,11 +109,7 @@ export default class Bar { height: this.height, rx: this.corner_radius, ry: this.corner_radius, - class: - 'bar' + - (/^((?!chrome|android).)*safari/i.test(navigator.userAgent) - ? ' safari' - : ''), + class: 'bar', append_to: this.bar_group, }); if (this.task.color) this.$bar.style.fill = this.task.color; @@ -148,13 +144,16 @@ export default class Bar { draw_progress_bar() { if (this.invalid) return; this.progress_width = this.calculate_progress_width(); + let r = this.corner_radius; + if (!/^((?!chrome|android).)*safari/i.test(navigator.userAgent)) + r = this.corner_radius + 2; this.$bar_progress = createSVG('rect', { x: this.x, y: this.y, width: this.progress_width, height: this.height, - rx: this.corner_radius + 2, - ry: this.corner_radius + 2, + rx: r, + ry: r, class: 'bar-progress', append_to: this.bar_group, }); diff --git a/src/styles/gantt.css b/src/styles/gantt.css index 5d5da89..983aecc 100644 --- a/src/styles/gantt.css +++ b/src/styles/gantt.css @@ -142,7 +142,6 @@ transition-duration: 150ms; background-color: var(--g-actions-background); text-align: -webkit-center; - text-align: center; border-radius: 0.5rem; border: none; padding: 5px 8px; @@ -150,7 +149,6 @@ font-size: 14px; letter-spacing: 0.02em; font-weight: 420; - height: 20px; box-sizing: content-box; margin-right: 5px; @@ -167,7 +165,6 @@ & .side-header select { padding-right: 1.25rem; width: 50px; - padding-left: 4px; } & .date-range-highlight { diff --git a/src/styles/light.css b/src/styles/light.css index 1b1be11..8f0448e 100644 --- a/src/styles/light.css +++ b/src/styles/light.css @@ -2,8 +2,8 @@ --g-arrow-color: #1f2937; --g-bar-color: #fff; --g-bar-border: #fff; - --g-tick-color-thick: #e2e8f0; - --g-tick-color: #f1f5f9; + --g-tick-color-thick: #ededed; + --g-tick-color: #f3f3f3; --g-actions-background: #f3f3f3; --g-border-color: #ebeff2; --g-text-muted: #7c7c7c; @@ -15,7 +15,7 @@ --g-expected-progress: #c4c4e9; --g-header-background: #fff; --g-row-color: #fdfdfd; - --g-row-border-color: #cbd5e1; + --g-row-border-color: #c7c7c7; --g-today-highlight: #37352f; --g-popup-actions: #ebeff2; --g-weekend-highlight-color: #f7f7f7; From 6311a1e32f79b58e662f5bf75db60b195d68363f Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Thu, 23 Jan 2025 11:48:04 +0530 Subject: [PATCH 5/5] fix: progress bug --- index.html | 1 + src/bar.js | 2 +- src/index.js | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 419d47c..60b672d 100644 --- a/index.html +++ b/index.html @@ -326,6 +326,7 @@ new Date().getTimezoneOffset() * 60000; function random(begin = 10, end = 90, multiple = 10) { + return undefined let k; do { k = Math.floor(Math.random() * 100); diff --git a/src/bar.js b/src/bar.js index 3701211..c915be0 100644 --- a/src/bar.js +++ b/src/bar.js @@ -56,7 +56,7 @@ export default class Bar { this.compute_duration(); this.corner_radius = this.gantt.options.bar_corner_radius; this.width = this.gantt.config.column_width * this.duration; - if (this.task.progress < 0) this.task.progress = 0; + if (!this.task.progress || this.task.progress < 0) this.task.progress = 0; if (this.task.progress > 100) this.task.progress = 100; } diff --git a/src/index.js b/src/index.js index 6602861..054d3e2 100644 --- a/src/index.js +++ b/src/index.js @@ -1335,7 +1335,6 @@ export default class Gantt { bind_bar_progress() { let x_on_start = 0; - let y_on_start = 0; let is_resizing = null; let bar = null; let $bar_progress = null;