From e5de9917fdd78d4cd3b46b376e3b2a4175efa36a Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 25 Nov 2018 15:00:08 +0100 Subject: [PATCH] material: fix missing thumbnail on list view Signed-off-by: Kevin Decherf --- .../static/themes/material/css/cards.scss | 34 ++++++++----------- .../material/Entry/_card_list.html.twig | 11 +++--- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index 6691adc6e..9e3599d5e 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss @@ -116,18 +116,6 @@ main { height: 13.5em; } - .card-image .preview, - .card-fullimage .preview { - height: 100%; - background: no-repeat 50%/cover; - background-color: #efefef; - display: block; - - &--default { - background-size: contain; - } - } - &.sw { max-width: 370px; margin-left: auto; @@ -142,6 +130,19 @@ a.original:not(.waves-effect) { display: block; } +.card .card-image .preview, +.card .card-fullimage .preview, +.card-stacked .preview { + height: 100%; + background: no-repeat 50%/cover; + background-color: #efefef; + display: block; + + &--default { + background-size: contain; + } +} + .card-entry-labels li, .card-tag-labels li { margin: 10px 10px 10px auto; @@ -210,16 +211,11 @@ a.original:not(.waves-effect) { text-align: right; } - .preview { + .card-preview { max-width: 100px; - height: auto; + max-height: 50px; margin-right: 10px; flex: 1; - - img { - max-width: 100%; - max-height: 100%; - } } div.metadata { diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig index 7c83c3bba..1c00f2fa3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig @@ -1,10 +1,9 @@
-
- {% if entry.previewPicture is not null %} - - - - {% endif %} + {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withTags': true, 'subClass': 'metadata'} only %}