diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
commit | 68003139e133835805b143b62c4407f19b495dab (patch) | |
tree | 9a71a15d021330fb6d55cc338f125161ddfc61dd /src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |
parent | bbd4ae7b56d9db744482a5630abad350f2d819af (diff) | |
parent | cb1a6590c0e58c56d0612066501b3a586b103ed5 (diff) | |
download | wallabag-68003139e133835805b143b62c4407f19b495dab.tar.gz wallabag-68003139e133835805b143b62c4407f19b495dab.tar.zst wallabag-68003139e133835805b143b62c4407f19b495dab.zip |
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | 12 |
1 files changed, 6 insertions, 6 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 de0049d3..f1ef01df 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -85,7 +85,7 @@ | |||
85 | <div class="input-field nav-panel-buttom"> | 85 | <div class="input-field nav-panel-buttom"> |
86 | <ul> | 86 | <ul> |
87 | <li class="bold"> | 87 | <li class="bold"> |
88 | <a title="{{ 'menu.top.add_new_entry'|trans }}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"> | 88 | <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.add_new_entry'|trans }}" href="{{ path('new') }}" id="nav-btn-add"> |
89 | <i class="material-icons">add</i> | 89 | <i class="material-icons">add</i> |
90 | </a> | 90 | </a> |
91 | </li> | 91 | </li> |
@@ -95,12 +95,12 @@ | |||
95 | </a> | 95 | </a> |
96 | </li>--> | 96 | </li>--> |
97 | <li id="button_filters"> | 97 | <li id="button_filters"> |
98 | <a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"> | 98 | <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> |
99 | <i class="material-icons">filter_list</i> | 99 | <i class="material-icons">filter_list</i> |
100 | </a> | 100 | </a> |
101 | </li> | 101 | </li> |
102 | <li id="button_export"> | 102 | <li id="button_export"> |
103 | <a title="{{ 'menu.top.export'|trans }}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export"> | 103 | <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export"> |
104 | <i class="material-icons">file_download</i> | 104 | <i class="material-icons">file_download</i> |
105 | </a> | 105 | </a> |
106 | </li> | 106 | </li> |
@@ -127,12 +127,12 @@ | |||
127 | <div class="footer-copyright"> | 127 | <div class="footer-copyright"> |
128 | <div class="container"> | 128 | <div class="container"> |
129 | <div class="row"> | 129 | <div class="row"> |
130 | <div class="col s8"> | 130 | <div class="col m12 l8 hide-on-small-only"> |
131 | <p> | 131 | <p title="{{ display_stats() | raw | striptags }}"> |
132 | {{ display_stats() }} | 132 | {{ display_stats() }} |
133 | </p> | 133 | </p> |
134 | </div> | 134 | </div> |
135 | <div class="col s4"> | 135 | <div class="col s12 l4"> |
136 | <p> | 136 | <p> |
137 | {{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a> – | 137 | {{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a> – |
138 | <a class="grey-text text-lighten-4" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans|lower }}</a> | 138 | <a class="grey-text text-lighten-4" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans|lower }}</a> |