Merge master

This commit is contained in:
Ben Word
2015-01-09 19:09:46 -06:00
19 changed files with 89 additions and 75 deletions

View File

@@ -0,0 +1,19 @@
.comment-list {
&:extend(.list-unstyled all);
}
.comment-list ol {
list-style: none;
}
.comment-form p {
&:extend(.form-group all);
}
.comment-form input[type="text"],
.comment-form input[type="email"],
.comment-form input[type="url"],
.comment-form textarea {
&:extend(.form-control all);
}
.comment-form input[type="submit"] {
&:extend(.btn all);
&:extend(.btn-primary all);
}

View File

@@ -4,7 +4,7 @@
}
.wp-caption-text {
&:extend(.thumbnail .caption);
&:extend(.thumbnail .caption all);
}
// Gallery shortcode

View File

@@ -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