Commit 6e932fa0 authored by Phil Hughes's avatar Phil Hughes

Merge branch '41404-pipelines-charts' into 'master'

Resolve "Pipeline graph uses inconsistent colors for its legend and its content"

Closes #41404

See merge request gitlab-org/gitlab-ce!16260
parents a04ef4db 5abc1682
...@@ -6,16 +6,16 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -6,16 +6,16 @@ document.addEventListener('DOMContentLoaded', () => {
const data = { const data = {
labels: chartScope.labels, labels: chartScope.labels,
datasets: [{ datasets: [{
fillColor: '#7f8fa4', fillColor: '#707070',
strokeColor: '#7f8fa4', strokeColor: '#707070',
pointColor: '#7f8fa4', pointColor: '#707070',
pointStrokeColor: '#EEE', pointStrokeColor: '#EEE',
data: chartScope.totalValues, data: chartScope.totalValues,
}, },
{ {
fillColor: '#44aa22', fillColor: '#1aaa55',
strokeColor: '#44aa22', strokeColor: '#1aaa55',
pointColor: '#44aa22', pointColor: '#1aaa55',
pointStrokeColor: '#fff', pointStrokeColor: '#fff',
data: chartScope.successValues, data: chartScope.successValues,
}, },
......
...@@ -993,3 +993,11 @@ button.mini-pipeline-graph-dropdown-toggle { ...@@ -993,3 +993,11 @@ button.mini-pipeline-graph-dropdown-toggle {
font-weight: $gl-font-weight-normal; font-weight: $gl-font-weight-normal;
line-height: 1.5; line-height: 1.5;
} }
.legend-all {
color: $gl-text-color-secondary;
}
.legend-success {
color: $green-500;
}
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
%h4= _("Pipelines charts") %h4= _("Pipelines charts")
%p %p
   
%span.cgreen %span.legend-success
= icon("circle") = icon("circle")
= s_("Pipeline|success") = s_("Pipeline|success")
   
%span.cgray %span.legend-all
= icon("circle") = icon("circle")
= s_("Pipeline|all") = s_("Pipeline|all")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment