diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
| commit | e4cf672ccf61689ba28c2e89fc55f83167800b18 (patch) | |
| tree | 5dc22c97797bdcdd0a3d2a7e182410f04a748c1e /src/Wallabag/CoreBundle/Resources/views/themes/material/Entry | |
| parent | e57df5611fe82ce61a71d51c762ee9296f18c3ac (diff) | |
| parent | dbe94e73a9eaf3acb250812913b0303b35d01a2e (diff) | |
| download | wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.gz wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.zst wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry')
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | 2 | ||||
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 55b3ee5c..919f94ec 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | |||
| @@ -77,7 +77,7 @@ | |||
| 77 | <div class="card-action"> | 77 | <div class="card-action"> |
| 78 | <span class="bold"> | 78 | <span class="bold"> |
| 79 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }}: {{ entry.title|e }} - {{ entry.domainName|removeWww }}" class="tool original grey-text"><span>{{ entry.domainName|removeWww|truncate(18) }}</span></a> | 79 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }}: {{ entry.title|e }} - {{ entry.domainName|removeWww }}" class="tool original grey-text"><span>{{ entry.domainName|removeWww|truncate(18) }}</span></a> |
| 80 | </bold> | 80 | </span> |
| 81 | 81 | ||
| 82 | <ul class="tools right"> | 82 | <ul class="tools right"> |
| 83 | <li> | 83 | <li> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 1ddb5a15..5188eb01 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
| @@ -225,7 +225,7 @@ | |||
| 225 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> | 225 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> |
| 226 | <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span> | 226 | <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span> |
| 227 | </a> | 227 | </a> |
| 228 | <span class="tool"><i class="material-icons link">comment</i> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | 228 | <span class="tool"><i class="material-icons link">comment</i></span> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> |
| 229 | <div id="list"> | 229 | <div id="list"> |
| 230 | {% for tag in entry.tags %} | 230 | {% for tag in entry.tags %} |
| 231 | <div class="chip"> | 231 | <div class="chip"> |