diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-27 11:07:46 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-05-16 12:22:17 +0100 |
| commit | 18b361cf809251dd633e31d3dd6d877b31d8db7f (patch) | |
| tree | 2569df180220a00852785e83d91f4e79bf6b7026 /app/views | |
| parent | 36fdbc6edb1c0884f68c1267902b33a78d7be6ae (diff) | |
| download | gitlab-ce-18b361cf809251dd633e31d3dd6d877b31d8db7f.tar.gz | |
Group the contributing calendar by day
This aligns the boxes correctly with the day on the left side of the calendar
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/users/calendar.html.haml | 17 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 7 |
2 files changed, 12 insertions, 12 deletions
diff --git a/app/views/users/calendar.html.haml b/app/views/users/calendar.html.haml index 2abee8be2a6..77f2ddefb1e 100644 --- a/app/views/users/calendar.html.haml +++ b/app/views/users/calendar.html.haml @@ -1,8 +1,9 @@ -#cal-heatmap.calendar - :javascript - new Calendar( - #{@timestamps.to_json}, - #{@starting_year}, - #{@starting_month}, - '#{user_calendar_activities_path}' - ); +.clearfix.calendar + .js-contrib-calendar + .calendar-hint + Summary of issues, merge requests, and push events +:javascript + new Calendar( + #{@timestamps.to_json}, + '#{user_calendar_activities_path}' + ); diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 9017fd54fcc..0c513308308 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -89,10 +89,9 @@ .tab-content #activity.tab-pane .row-content-block.calender-block.white.second-block.hidden-xs - %div{ class: container_class } - .user-calendar{data: {href: user_calendar_path}} - %h4.center.light - %i.fa.fa-spinner.fa-spin + .user-calendar{data: {href: user_calendar_path}} + %h4.center.light + %i.fa.fa-spinner.fa-spin .user-calendar-activities .content_list{ data: {href: user_path} } |