Merge master

2015-01-09 19:09:46 -06:00
parent 2ac5a1e0d4 271fad502a
commit dadb2ce632
19 changed files with 89 additions and 75 deletions
--- a/assets/styles/main.less
+++ b/assets/styles/main.less
@@ -8,6 +8,7 @@
 // Roots
@import "_global";                   // Base styling & custom mixins
@import "components/_buttons";       // Button tweaks
+@import "components/_comments";      // Comment styling
@import "components/_forms";         // Form tweaks
@import "components/_media";         // WordPress media
@import "components/_wp-classes";    // WordPress generated classes