mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-26 11:01:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3782 from wallabag/issue-3779

Browse source 
material: fix missing thumbnail on list view
This commit is contained in:
Kevin Decherf 2018-11-26 18:45:12 +01:00 committed by GitHub
commit 72efc8ceeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/Resources/static/themes/material/css/cards.scss
View file

@ -116,18 +116,6 @@ main {
height: 13.5em; 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 { &.sw {
max-width: 370px; max-width: 370px;
margin-left: auto; margin-left: auto;
@ -142,6 +130,19 @@ a.original:not(.waves-effect) {
display: block; 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-entry-labels li,
.card-tag-labels li { .card-tag-labels li {
margin: 10px 10px 10px auto; margin: 10px 10px 10px auto;
@ -210,16 +211,11 @@ a.original:not(.waves-effect) {
text-align: right; text-align: right;
} }
.preview { .card-preview {
max-width: 100px; max-width: 100px;
height: auto; max-height: 50px;
margin-right: 10px; margin-right: 10px;
flex: 1; flex: 1;
img {
max-width: 100%;
max-height: 100%;
}
} }
div.metadata { div.metadata {

11
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
View file

@ -1,10 +1,9 @@
<div class="card-stacked"> <div class="card-stacked">
<div class="preview"> <div class="card-preview">
{% if entry.previewPicture is not null %} <a href="{{ path('view', { 'id': entry.id }) }}">
<a href="{{ path('view', { 'id': entry.id }) }}"> {% set previewClassModifier = entry.previewPicture ? '' : ' preview--default' %}
<img src="{{ entry.previewPicture }}" /> <span class="preview{{ previewClassModifier }}" style="background-image: url({{ entry.previewPicture | default(asset('wallassets/themes/_global/img/logo-square.svg')) }})"></span>
</a> </a>
{% endif %}
</div> </div>
{% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withTags': true, 'subClass': 'metadata'} only %} {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withTags': true, 'subClass': 'metadata'} only %}
<ul class="tools-list hide-on-small-only"> <ul class="tools-list hide-on-small-only">