diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-17 16:07:41 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-17 16:07:41 +0000 |
| commit | 7b944e01bddea2ae2ee8e4f68976df9cd8ce63bc (patch) | |
| tree | 0a51f70bf86f51d8887d2d489391ff7a23f431cb | |
| parent | 6c292e90be711392beaba90bfd8c40079da0266b (diff) | |
| parent | f1a0e88201e0f9bdfc828858268149b386a625b1 (diff) | |
| download | gitlab-ce-7b944e01bddea2ae2ee8e4f68976df9cd8ce63bc.tar.gz | |
Merge branch 'contrib-calendar-colors' into 'master'
Fixed issue with user calendar colors
## What does this MR do?
Fixes an issue with the colors added onto the user contrib calendar. The calendar was change recently to remove a library which affected how the colors where generated.
## What are the relevant issue numbers?
Closes #18505
## Screenshots (if relevant)
See merge request !4614
| -rw-r--r-- | app/assets/javascripts/users/calendar.js.coffee | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/app/assets/javascripts/users/calendar.js.coffee b/app/assets/javascripts/users/calendar.js.coffee index 26a26061539..c081f023b04 100644 --- a/app/assets/javascripts/users/calendar.js.coffee +++ b/app/assets/javascripts/users/calendar.js.coffee @@ -6,12 +6,6 @@ class @Calendar @daySizeWithSpace = @daySize + (@daySpace * 2) @monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] @months = [] - @highestValue = 0 - - # Get the highest value from the timestampes - _.each timestamps, (count) => - if count > @highestValue - @highestValue = count # Loop through the timestamps to create a group of objects # The group of objects will be grouped based on the day of the week they are @@ -39,8 +33,8 @@ class @Calendar i++ # Init color functions - @color = @initColor() @colorKey = @initColorKey() + @color = @initColor() # Init the svg element @renderSvg(group) @@ -104,7 +98,7 @@ class @Calendar .attr 'class', 'user-contrib-cell js-tooltip' .attr 'fill', (stamp) => if stamp.count isnt 0 - @color(stamp.count) + @color(Math.min(stamp.count, 40)) else '#ededed' .attr 'data-container', 'body' @@ -164,10 +158,11 @@ class @Calendar color initColor: -> + colorRange = ['#ededed', @colorKey(0), @colorKey(1), @colorKey(2), @colorKey(3)] d3.scale - .linear() - .range(['#acd5f2', '#254e77']) - .domain([0, @highestValue]) + .threshold() + .domain([0, 10, 20, 30]) + .range(colorRange) initColorKey: -> d3.scale |