mirror of
https://github.com/wallabag/wallabag.git
synced 2025-06-27 16:36:00 +00:00
Improve display of articles with annotations
This commit is contained in:
parent
fcdcd5dfe3
commit
ba550268c5
5 changed files with 22 additions and 12 deletions
|
@ -183,6 +183,12 @@
|
|||
display: none;
|
||||
}
|
||||
|
||||
blockquote.annotations {
|
||||
margin-top: 5px;
|
||||
padding-left: 1rem;
|
||||
border-left: 5px solid #00acc1;
|
||||
}
|
||||
|
||||
footer {
|
||||
&.page-footer {
|
||||
margin-top: 10px;
|
||||
|
|
|
@ -10,13 +10,17 @@
|
|||
{{ entry.title|striptags|default('entry.default_title'|trans)|raw }}
|
||||
{% endif %}
|
||||
|
||||
<div class="{{ subClass|default('original grey-text') }}">
|
||||
<a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool grey-text">{{ entry.domainName|removeWww }}</a>
|
||||
{% if withMetadata is defined %}
|
||||
{% include "Entry/_tags.html.twig" with {'tags': entry.tags|slice(0, 3), 'entryId': entry.id, 'listClass': ' hide-on-med-and-down'} only %}
|
||||
<div class="reading-time grey-text">
|
||||
<div class="card-reading-time">{% include "Entry/_reading_time.html.twig" with {'entry': entry} only %}</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% if currentRoute == 'annotated' %}
|
||||
<blockquote class="annotations">{{ entry.annotations[0].text|u.truncate(80, '...') }}</blockquote>
|
||||
{% else %}
|
||||
<div class="{{ subClass|default('original grey-text') }}">
|
||||
<a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool grey-text">{{ entry.domainName|removeWww }}</a>
|
||||
{% if withMetadata is defined %}
|
||||
{% include "Entry/_tags.html.twig" with {'tags': entry.tags|slice(0, 3), 'entryId': entry.id, 'listClass': ' hide-on-med-and-down'} only %}
|
||||
<div class="reading-time grey-text">
|
||||
<div class="card-reading-time">{% include "Entry/_reading_time.html.twig" with {'entry': entry} only %}</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
{% include "Entry/Card/_content.html.twig" with {'entry': entry} only %}
|
||||
{% include "Entry/Card/_content.html.twig" with {'entry': entry, 'currentRoute': currentRoute} only %}
|
||||
</div>
|
||||
|
||||
{% include "Entry/_card_actions.html.twig" with {'entry': entry} only %}
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% include "Entry/Card/_content.html.twig" with {'entry': entry, 'withMetadata': true, 'subClass': 'metadata'} only %}
|
||||
{% include "Entry/Card/_content.html.twig" with {'entry': entry, 'withMetadata': true, 'subClass': 'metadata', 'currentRoute': currentRoute} only %}
|
||||
|
||||
{% set current_path = app.request.requesturi %}
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
{% include "Entry/Card/_content.html.twig" with {'entry': entry, 'withPreview': true} only %}
|
||||
{% include "Entry/Card/_content.html.twig" with {'entry': entry, 'withPreview': true, 'currentRoute': currentRoute} only %}
|
||||
</div>
|
||||
|
||||
<div class="card-reveal">
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue