diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-28 16:15:27 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-28 16:15:27 +0200 |
commit | cdd3010b478c9ca818dd6d22d03c81ef4a5ab208 (patch) | |
tree | ffc9957fc228625501214bbb2e9f4bebe7936982 /src/Wallabag/CoreBundle/Resources/views/themes/material | |
parent | 13d44ca766b1020327f0b9b005dc2e95deb156a1 (diff) | |
parent | 985f5f9d05f7ff7e443442b1775923b379c141d6 (diff) | |
download | wallabag-cdd3010b478c9ca818dd6d22d03c81ef4a5ab208.tar.gz wallabag-cdd3010b478c9ca818dd6d22d03c81ef4a5ab208.tar.zst wallabag-cdd3010b478c9ca818dd6d22d03c81ef4a5ab208.zip |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')
-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/layout.html.twig | 4 |
2 files changed, 4 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 a061bdc3..806a4eef 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 | |||
@@ -29,7 +29,7 @@ | |||
29 | <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i> | 29 | <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i> |
30 | {% endif %} | 30 | {% endif %} |
31 | 31 | ||
32 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|striptags }}">{{ entry.title|striptags|raw }}</a></span> | 32 | <span class="card-title dot-ellipsis dot-resize-update"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|raw }}</a></span> |
33 | 33 | ||
34 | <div class="estimatedTime grey-text"> | 34 | <div class="estimatedTime grey-text"> |
35 | <span class="tool reading-time"> | 35 | <span class="tool reading-time"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 50134357..6e95345c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -7,7 +7,9 @@ | |||
7 | 7 | ||
8 | {% block scripts %} | 8 | {% block scripts %} |
9 | {{ parent() }} | 9 | {{ parent() }} |
10 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/material.min.js') }}"></script> | 10 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/jquery.tinydot.min.js') }}"></script> |
11 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/materialize.min.js') }}"></script> | ||
12 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script> | ||
11 | {% endblock %} | 13 | {% endblock %} |
12 | 14 | ||
13 | {% block header %} | 15 | {% block header %} |