search

civic-commons / opencivic

A Drupal distro for app catalogs and hackathons
https://drupal.org/project/opencivic
16 stars 2 forks source link

Refactor theming #91

Closed sheldonrampton closed 11 years ago

sheldonrampton commented 11 years ago

Paul, I tried reviewing your theming changes in the theming-sass and theming-smacss branches but encountered some merge conflicts and thought I should check with you before proceeding further.

pmackay commented 11 years ago

Where did merge conflicts come from when reviewing?

pmackay commented 11 years ago

SMACSS improvements merged into master.