Issue #3636973 by jwilson3: Fix Rivet CSS cascade order

James Wilsonrequested to merge
issue/rivet-3636973:3636973-fix-css-cascade into 1.2.x

Closes #3636973

Merge request reports