Fix the following style-lint errors and warnings for `app/assets/stylesheets/pages/merge_conflicts.scss`
Problem
Fix the following style-lint errors and warnings for app/assets/stylesheets/pages/merge_conflicts.scss
122:10 ⚠ Selector should be written in lowercase with hyphens selector-class-pattern
173:7 ⚠ "&.unselected" and "&.unselected (/Users/filipalacerda/Documents/git/gitlab-development-kit/gitlab/app/assets/stylesheets/pages/merge_conflicts.scss -143:7)" have the same properties. stylelint-gitlab/duplicate-selectors
185:3 ⚠ Selector should be written in lowercase with hyphens selector-class-pattern
205:7 ⚠ "&.unselected" and "&.unselected (/Users/filipalacerda/Documents/git/gitlab-development-kit/gitlab/app/assets/stylesheets/pages/merge_conflicts.scss -193:7)" have the same properties. stylelint-gitlab/duplicate-selectors
228:20 ⚠ Selector should be written in lowercase with hyphens selector-class-pattern
233:3 ⚠ Selector should be written in lowercase with hyphens selector-class-pattern
271:7 ⚠ Expected "#conflicts .editor-wrap .editor pre" to have no more than 3 compound selectors selector-max-compound-selectors
279:5 ⚠ ".loading" and ".editor (/Users/filipalacerda/Documents/git/gitlab-development-kit/gitlab/app/assets/stylesheets/pages/merge_conflicts.scss -255:7)" have the same properties. stylelint-gitlab/duplicate-selectors
What to do
- If possible, replace the CSS class with a utility one, check common.scss and https://getbootstrap.com/docs/4.3/utilities/ for existing ones
- Double check if all the warning have been fixed by running
yarn run stylelint-file app/assets/stylesheets/pages/merge_conflicts.scss
- In the MR, add screenshots of the affected areas before and after the changes, check the first MR as a guideline
- If there are a lot of changes, we recommend to break them into smaller MRs
- Double check the usage of each changed class both in CE and EE
- EE changes should either be backported into CE or moved into
ee/
folder. You can read more about how to handle EE code here - Label the MR with CSS cleanup