diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-09-02 10:27:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-02 10:27:41 +0200 |
| commit | 336262e6ee9c57437793a06fb416206ac73a1702 (patch) | |
| tree | ca9f9312d0b52828a2d12a95fe7f5dd2fc138b7a /src/Wallabag/CoreBundle/Resources/views | |
| parent | 33adf8dc915f4911fd454e98194c1b2323514d4a (diff) | |
| parent | a8d5aa1c44c3349a9271e5f0bc3cb5154d6505d9 (diff) | |
| download | wallabag-336262e6ee9c57437793a06fb416206ac73a1702.tar.gz wallabag-336262e6ee9c57437793a06fb416206ac73a1702.tar.zst wallabag-336262e6ee9c57437793a06fb416206ac73a1702.zip | |
Merge pull request #2252 from wallabag/fix-last-merge
Fixed last merge who caused CSS/JS bugs
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views')
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | 4 |
1 files changed, 1 insertions, 3 deletions
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 6e95345c..50134357 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
| @@ -7,9 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | {% block scripts %} | 8 | {% block scripts %} |
| 9 | {{ parent() }} | 9 | {{ parent() }} |
| 10 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/jquery.tinydot.min.js') }}"></script> | 10 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/material.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> | ||
| 13 | {% endblock %} | 11 | {% endblock %} |
| 14 | 12 | ||
| 15 | {% block header %} | 13 | {% block header %} |