From 02012fff05982643b14d39fb01de0c6507a25a5b Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Thu, 16 Jan 2025 11:51:26 +0530 Subject: [PATCH] fix: minor ui issues --- src/bar.js | 4 ++-- src/index.js | 13 +++++-------- src/styles/gantt.css | 10 +++------- src/styles/light.css | 2 +- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/bar.js b/src/bar.js index 2ff5c45..490b165 100644 --- a/src/bar.js +++ b/src/bar.js @@ -153,8 +153,8 @@ export default class Bar { y: this.y, width: this.progress_width, height: this.height, - rx: this.corner_radius, - ry: this.corner_radius, + rx: this.corner_radius + 2, + ry: this.corner_radius + 2, class: 'bar-progress', append_to: this.bar_group, }); diff --git a/src/index.js b/src/index.js index 93524b6..2f92243 100644 --- a/src/index.js +++ b/src/index.js @@ -228,9 +228,9 @@ export default class Gantt { if (typeof mode === 'string') { mode = this.options.view_modes.find((d) => d.name === mode); } - let old_date, old_scroll_op; + let old_pos, old_scroll_op; if (maintain_pos) { - old_date = this.current_date; + old_pos = this.$container.scrollLeft; old_scroll_op = this.options.scroll_to; this.options.scroll_to = null; } @@ -240,11 +240,8 @@ export default class Gantt { this.setup_dates(maintain_pos); this.render(); if (maintain_pos) { + this.$container.scrollLeft =old_pos; this.options.scroll_to = old_scroll_op; - this.$container.scrollLeft = - (date_utils.diff(old_date, this.gantt_start, this.config.unit) / - this.config.step) * - this.config.column_width; } this.trigger_event('view_change', [mode]); } @@ -1024,9 +1021,9 @@ export default class Gantt { bind_grid_click() { $.on( - this.$svg, + this.$container, 'click', - '.grid-row, .grid-header, .ignored-bar', + '.grid-row, .grid-header, .ignored-bar, .holiday-highlight', () => { this.unselect_all(); this.hide_popup(); diff --git a/src/styles/gantt.css b/src/styles/gantt.css index bddfc47..419d6f8 100644 --- a/src/styles/gantt.css +++ b/src/styles/gantt.css @@ -274,6 +274,7 @@ & .bar-progress { fill: var(--g-progress-color); + border-radius: 4px; } & .bar-expected-progress { @@ -320,16 +321,11 @@ } & .bar-wrapper { - cursor: pointer; + cursor: pointer; & .bar { - -webkit-filter: drop-shadow(1px 1px 2px rgba(15, 15, 15, 0.2)); - filter: drop-shadow(1px 1px 2px rgba(15, 15, 15, 0.2)); - border-radius: 3px; - } - - & .bar.safari { outline: 1px solid black; + border-radius: 3px; } &:hover { diff --git a/src/styles/light.css b/src/styles/light.css index a17c74c..1b3d7c8 100644 --- a/src/styles/light.css +++ b/src/styles/light.css @@ -9,7 +9,7 @@ --g-text-muted: #7c7c7c; --g-text-light: #fff; --g-text-dark: #171717; - --g-progress-color: #f3f3f3; + --g-progress-color: #dbdbdb; --g-handle-color: #37352f; --g-weekend-label-color: #dcdce4; --g-expected-progress: #c4c4e9;