Commit bdfc3d7c authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch...

Merge branch '10949-fix-the-following-style-lint-errors-and-warnings-for-ee-app-assets-stylesheets-pages-milestone-scss' into 'master'

Resolve "Fix the following style-lint errors and warnings for `ee/app/assets/stylesheets/pages/milestone.scss`"

Closes #10949

See merge request gitlab-org/gitlab-ee!11665
parents 748340f3 0d8a87ea
...@@ -32,9 +32,9 @@ export default () => { ...@@ -32,9 +32,9 @@ export default () => {
if (currentView !== show) { if (currentView !== show) {
currentView = show; currentView = show;
$this $this
.addClass('active') .removeClass('btn-inverted')
.siblings() .siblings()
.removeClass('active'); .addClass('btn-inverted');
switch (show) { switch (show) {
case 'count': case 'count':
chart.setData(openIssuesCount, { label: 'Open issues', animate: true }); chart.setData(openIssuesCount, { label: 'Open issues', animate: true });
......
...@@ -59,18 +59,6 @@ ...@@ -59,18 +59,6 @@
margin-left: 20px; margin-left: 20px;
margin-bottom: 2px; margin-bottom: 2px;
} }
.btn {
@include btn-outline($white-light, $blue-500, $blue-500, $blue-500, $white-light, $blue-600, $blue-600, $blue-700);
font-size: 12px;
&.active {
background-color: $blue-500;
border-color: $blue-600;
color: $white-light;
}
}
} }
.burndown-chart { .burndown-chart {
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
%h3 %h3
Burndown chart Burndown chart
.btn-group.js-burndown-data-selector .btn-group.js-burndown-data-selector
%button.btn.btn-sm.active{ data: { show: 'count' } } %button.btn.btn-sm.btn-primary{ data: { show: 'count' } }
Issues Issues
%button.btn.btn-sm{ data: { show: 'weight' } } %button.btn.btn-sm.btn-primary.btn-inverted{ data: { show: 'weight' } }
Issue weight Issue weight
.burndown-chart{ data: { start_date: burndown.start_date.strftime("%Y-%m-%d"), due_date: burndown.due_date.strftime("%Y-%m-%d"), chart_data: burndown.to_json } } .burndown-chart{ data: { start_date: burndown.start_date.strftime("%Y-%m-%d"), due_date: burndown.due_date.strftime("%Y-%m-%d"), chart_data: burndown.to_json } }
......
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