Rearrange sass to make css pass Drupal style guidelines