2 files changed, 9 insertions, 4 deletions

diff --git a/tpl/objects/button.pug b/tpl/objects/button.pug
index b5fb8da..1fa3347 100644
--- a/tpl/objects/button.pug
+++ b/tpl/objects/button.pug
@@ -5,7 +5,7 @@ mixin a-button
             'o-button--block':   attributes.block,
             'o-button--primary': attributes.primary,
             'o-button--outline': attributes.outline,
-            'o-button--round':   !!attributes.icon
+            'o-button--round':   !!attributes.icon && !block
         }
         if (attributes.variant) {
             classes['o-button--' + attributes.variant] = true
diff --git a/tpl/objects/card.pug b/tpl/objects/card.pug
index d61393d..d7595d1 100644
--- a/tpl/objects/card.pug
+++ b/tpl/objects/card.pug
@@ -1,7 +1,12 @@
 mixin card
     -
         let classes = {
-            'o-card': true,
+            'o-card':        true,
+            'o-card--quiet': !!attributes.quiet,
+        }
+
+        if (attributes.class) {
+            classes[attributes.class] = true;
         }
 
     if attributes.href
@@ -13,10 +18,10 @@ mixin card
 
 mixin card-image
     .o-card__image
-        img.o-card__image-img(src=attributes.src)
+        img.o-card__image-img(src=attributes.src style=attributes.style)
 
 mixin card-body
-    .o-card__body
+    .o-card__body(style=attributes.style)
         block
 
 mixin card-title