diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-07-30 15:51:38 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-07-30 15:51:38 +0200 |
| commit | b4555df336d05481de3077f3513a34b315f39bce (patch) | |
| tree | e6600dd082d1a2d26f0a2198eee0ba92775c2f56 /addons/web/static/src | |
| parent | 26aff789c95cdbb05d96487d9ae8f29174e2f08c (diff) | |
| parent | 3376bad191d708793c72809badd720cee262702f (diff) | |
[MERGE] forward port branch saas-11.2 up to 3376bad191d
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/reset.min.css | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/kanban/kanban_column_progressbar.js | 8 | ||||
| -rw-r--r-- | addons/web/static/src/less/kanban_column_progressbar.less | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/addons/web/static/src/css/reset.min.css b/addons/web/static/src/css/reset.min.css index ee21ad74e7d..97c0b78b002 100644 --- a/addons/web/static/src/css/reset.min.css +++ b/addons/web/static/src/css/reset.min.css @@ -48,6 +48,7 @@ ol { ul { list-style: disc; + padding-left: 40px; } ul ul { diff --git a/addons/web/static/src/js/views/kanban/kanban_column_progressbar.js b/addons/web/static/src/js/views/kanban/kanban_column_progressbar.js index fad822efdb9..b597ccf1c60 100644 --- a/addons/web/static/src/js/views/kanban/kanban_column_progressbar.js +++ b/addons/web/static/src/js/views/kanban/kanban_column_progressbar.js @@ -141,6 +141,7 @@ var KanbanColumnProgressBar = Widget.extend({ } // Display and animate the progress bars + var barNumber = 0; _.each(self.colors, function (val, key) { var $bar = self.$bars[val]; var count = self.subgroupCounts && self.subgroupCounts[key] || 0; @@ -165,7 +166,14 @@ var KanbanColumnProgressBar = Widget.extend({ window.getComputedStyle($bar[0]).getPropertyValue('width'); // Force reflow so that animations work if (count > 0) { $bar.addClass('o_bar_has_records'); + // Make sure every bar that has records has some space + // and that everything adds up to 100% + var minWidth = 6*barNumber; + var maxWidth = 100 - minWidth; + self.$('.progress-bar.o_bar_has_records').css('max-width', maxWidth + '%'); + self.$('.progress-bar.o_bar_has_records').css('min-width', minWidth + '%'); $bar.css('width', (count * 100 / self.groupCount) + '%'); + barNumber++; } else { $bar.css('width', ''); } diff --git a/addons/web/static/src/less/kanban_column_progressbar.less b/addons/web/static/src/less/kanban_column_progressbar.less index f4cffd6c097..233ae5c0d01 100644 --- a/addons/web/static/src/less/kanban_column_progressbar.less +++ b/addons/web/static/src/less/kanban_column_progressbar.less @@ -73,11 +73,6 @@ margin-bottom: 0; box-shadow: none; cursor: pointer; - - // Be sure that a bar with data has a minimun width - &.o_bar_has_records { - min-width: 10px; - } } .o_kanban_counter_label { |