Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
dabd416a
Commit
dabd416a
authored
Feb 03, 2022
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Roadmap - Fix bar width for week layout
Changelog: fixed EE: true
parent
d2171720
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ee/app/assets/javascripts/roadmap/mixins/weeks_preset_mixin.js
...p/assets/javascripts/roadmap/mixins/weeks_preset_mixin.js
+1
-1
ee/spec/frontend/roadmap/mixins/weeks_preset_mixin_spec.js
ee/spec/frontend/roadmap/mixins/weeks_preset_mixin_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/roadmap/mixins/weeks_preset_mixin.js
View file @
dabd416a
...
...
@@ -115,7 +115,7 @@ export default {
timelineBarWidth
+=
this
.
getBarWidthForSingleWeek
(
cellWidth
,
date
);
}
}
else
if
(
this
.
isTimeframeUnderEndDateForWeek
(
this
.
timeframe
[
i
]))
{
timelineBarWidth
+=
this
.
getBarWidthForSingleWeek
(
cellWidth
,
itemEndDate
.
day
+
1
);
timelineBarWidth
+=
this
.
getBarWidthForSingleWeek
(
cellWidth
,
itemEndDate
.
day
);
break
;
}
else
{
timelineBarWidth
+=
this
.
getBarWidthForSingleWeek
(
cellWidth
,
7
);
...
...
ee/spec/frontend/roadmap/mixins/weeks_preset_mixin_spec.js
View file @
dabd416a
...
...
@@ -201,7 +201,7 @@ describe('WeeksPresetMixin', () => {
approximately 154px ^
~ approximately 154px
*/
const
expectedTimelineBarWidth
=
4
88
;
// in px;
const
expectedTimelineBarWidth
=
4
62
;
// in px;
expect
(
Math
.
floor
(
wrapper
.
vm
.
getTimelineBarWidthForWeeks
())).
toBe
(
expectedTimelineBarWidth
);
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment