Improved card

3 files changed, 12 insertions, 16 deletions

diff --git a/src/objects/_card.scss b/src/objects/_card.scss
index 2920cfc..f22db21 100644
--- a/src/objects/_card.scss
+++ b/src/objects/_card.scss
@@ -43,6 +43,9 @@
 
         @include bem.modifier('borderless') {
             border-color: props.get(vars.$bg-color);
+        }
+
+        @include bem.modifier('shadow') {
             box-shadow:
                 props.get(vars.$shadow-x)
                 props.get(vars.$shadow-y)
@@ -62,17 +65,6 @@
             }
         }
 
-        @include bem.modifier('merge') {
-            border-color: props.get(vars.$bg-color);
-            box-shadow:   none;
-
-            @include bem.modifier('quiet') {
-                @include bem.elem('image') {
-                    box-shadow: none;
-                }
-            }
-        }
-
         @include bem.elem('avatar') {
             margin-block-start:  props.get(vars.$pad-b);
             margin-inline-start: props.get(vars.$pad-i);
diff --git a/tpl/objects/card.pug b/tpl/objects/card.pug
index cd4f75c..feb1441 100644
--- a/tpl/objects/card.pug
+++ b/tpl/objects/card.pug
@@ -3,7 +3,7 @@ mixin card
         let classes = {
             'o-card':             true,
             'o-card--borderless': !!attributes.borderless,
-            'o-card--merge':      !!attributes.merge,
+            'o-card--shadow':     !!attributes.shadow,
             'o-card--quiet':      !!attributes.quiet,
             'o-card--thumbnail':  !!attributes.thumbnail,
         }
diff --git a/tpl/views/card.pug b/tpl/views/card.pug
index 8f74ea2..7270d79 100644
--- a/tpl/views/card.pug
+++ b/tpl/views/card.pug
@@ -5,7 +5,7 @@ mixin view-card
                 +card-body
                     strong= 'Lorem ipsum dolor'
                     = 'sit amet'
-            +card(href='#' class='l-card-list__card')
+            +card(href='#' class='l-card-list__card' shadow=true)
                 +card-body
                     strong= 'Lorem ipsum dolor'
                     = 'sit amet'
@@ -13,19 +13,23 @@ mixin view-card
                 +card-body
                     strong= 'Lorem ipsum dolor'
                     = 'sit amet'
+            +card(href='#' class='l-card-list__card' shadow=true borderless=true)
+                +card-body
+                    strong= 'Lorem ipsum dolor'
+                    = 'sit amet'
 
         +divider('faint')(class='u-mb-700')
 
         .l-card-list.l-card-list--merge
-            +card(href='#' class='l-card-list__card' borderless=true merge=true)
+            +card(href='#' class='l-card-list__card' borderless=true)
                 +card-body
                     strong= 'Lorem ipsum dolor'
                     = 'sit amet'
-            +card(href='#' class='l-card-list__card' merge=true)
+            +card(href='#' class='l-card-list__card' borderless=true)
                 +card-body
                     strong= 'Lorem ipsum dolor'
                     = 'sit amet'
-            +card(href='#' class='l-card-list__card' merge=true)
+            +card(href='#' class='l-card-list__card' borderless=true)
                 +card-body
                     strong= 'Lorem ipsum dolor'
                     = 'sit amet'