I would think that if the merge happened all at once (with no other commits from other MR's) it would be painless. Most of the changes are relatively minimal. FFF to fff is not cause for conflict as I understand it. But as @rspeicher and I were just saying we want to keep our commits down to less than 200 changes. The smaller the better. I don't think it matters how you divide it up, just that you do divide it up.
HEX Formatting - HEX Color values should use lowercase always and shorthand where possible, e.g. '#fff'.
Indentation - Use two spaces per indentation level.
Shorthand - Use shorthand values for margin, padding, etc.
SelectorFormat - Selectors (class and id names) should always use hyphenated-lowercase, rather than camelCase or snake_case.
SpaceAfterPropertyColon - Properties should be formatted with a single space separating the colon from the property's value.
ZeroUnit - Omit length units on zero values, e.g. 0px vs. 0.
Note that if you want a line or set of lines to be ignored by the Linter, you can use // scss-lint:disable RuleName (more info):
// This lint rule is disabled because the class name comes from a gem.// scss-lint:disable SelectorFormat.ui_charcoal{background-color:#333;}// scss-lint:enable SelectorFormat
You'll need to make sure to add a comment on the line above the disable, otherwise the linter will throw a warning because we enable the rule DisableLinterReason. This is to make sure we aren't just ignoring the style guide for no reason, and that others know why the rule is disabled in this specific instance.
Just wondering. I went through it myself but this sort of thing is prone to error. At least we have a tool and linter now. The key is not to make anything a completely different color than it was before.
@jschatz1 opened a bunch of MRs fixing the remaining lints. Only 4 left after all these are merged, and all were introduced after I fixed the lints for the SpaceAfterPropertyColon rule :)
Assuming you approve of the changes, is it alright for me to make a single MR that fixes those last few lints and also enables the CI test?