diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-01-30 20:53:29 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-01-30 20:53:29 +0000 |
| commit | 6f32fa6628785094e7bbf94f22272abe4991d14a (patch) | |
| tree | 5fe1cad321914b241f78fe1c411346e267675c9f | |
| parent | 95b4f7ea37d641c7c30e9903dd3390a7d04a6e67 (diff) | |
| parent | ba55dfd6bfb42d8eca74f9805b10e3ac2d84cfe8 (diff) | |
| download | gitlab-ce-6f32fa6628785094e7bbf94f22272abe4991d14a.tar.gz | |
Merge branch 'cal-label-fix' into 'master'
Contribution calendar label cutoff fix
See merge request gitlab-org/gitlab-ce!16769
| -rw-r--r-- | app/assets/javascripts/users/activity_calendar.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/contribution_calendar_label_cut_off.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/users/activity_calendar.js b/app/assets/javascripts/users/activity_calendar.js index 0581239d5a5..0ca54faa71c 100644 --- a/app/assets/javascripts/users/activity_calendar.js +++ b/app/assets/javascripts/users/activity_calendar.js @@ -98,7 +98,7 @@ export default class ActivityCalendar { const secondLastColMonth = this.timestampsTmp[group - 2][0].date.getMonth(); if (lastColMonth !== secondLastColMonth) { - extraWidthPadding = 3; + extraWidthPadding = 6; } return extraWidthPadding; diff --git a/changelogs/unreleased/contribution_calendar_label_cut_off.yml b/changelogs/unreleased/contribution_calendar_label_cut_off.yml new file mode 100644 index 00000000000..0b4a746bab8 --- /dev/null +++ b/changelogs/unreleased/contribution_calendar_label_cut_off.yml @@ -0,0 +1,5 @@ +--- +title: Contribution calendar label was cut off +merge_request: +author: Branka Martinovic +type: fixed |