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
This commit is contained in:
commit
6e932fa065
3 changed files with 16 additions and 8 deletions
|
@ -6,16 +6,16 @@ document.addEventListener('DOMContentLoaded', () => {
|
|||
const data = {
|
||||
labels: chartScope.labels,
|
||||
datasets: [{
|
||||
fillColor: '#7f8fa4',
|
||||
strokeColor: '#7f8fa4',
|
||||
pointColor: '#7f8fa4',
|
||||
fillColor: '#707070',
|
||||
strokeColor: '#707070',
|
||||
pointColor: '#707070',
|
||||
pointStrokeColor: '#EEE',
|
||||
data: chartScope.totalValues,
|
||||
},
|
||||
{
|
||||
fillColor: '#44aa22',
|
||||
strokeColor: '#44aa22',
|
||||
pointColor: '#44aa22',
|
||||
fillColor: '#1aaa55',
|
||||
strokeColor: '#1aaa55',
|
||||
pointColor: '#1aaa55',
|
||||
pointStrokeColor: '#fff',
|
||||
data: chartScope.successValues,
|
||||
},
|
||||
|
|
|
@ -993,3 +993,11 @@ button.mini-pipeline-graph-dropdown-toggle {
|
|||
font-weight: $gl-font-weight-normal;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.legend-all {
|
||||
color: $gl-text-color-secondary;
|
||||
}
|
||||
|
||||
.legend-success {
|
||||
color: $green-500;
|
||||
}
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
%h4= _("Pipelines charts")
|
||||
%p
|
||||
|
||||
%span.cgreen
|
||||
%span.legend-success
|
||||
= icon("circle")
|
||||
= s_("Pipeline|success")
|
||||
|
||||
%span.cgray
|
||||
%span.legend-all
|
||||
= icon("circle")
|
||||
= s_("Pipeline|all")
|
||||
|
||||
|
|
Loading…
Reference in a new issue