aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-12-30 15:01:39 +0100
committerGitHub <noreply@github.com>2016-12-30 15:01:39 +0100
commit144f2039e42aad68581bd2f3df33922b33e907c4 (patch)
treebaa7203d238d55cab0d784cea417aac8d31a0a6d /src/Wallabag
parent4da856ef118f0f15080f4e39c42a3b68611c05f1 (diff)
parentccb9e79a35cdac9f93de90f577f8ec63fdcc6081 (diff)
downloadwallabag-144f2039e42aad68581bd2f3df33922b33e907c4.tar.gz
wallabag-144f2039e42aad68581bd2f3df33922b33e907c4.tar.zst
wallabag-144f2039e42aad68581bd2f3df33922b33e907c4.zip
Merge pull request #2729 from Simounet/fix/double-overlay-right-sidenav
Fix double overlay on expanded right sidenav
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index a4a56e46..95c84686 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -18,8 +18,8 @@
18 <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> 18 <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
19 <div class="pagination"> 19 <div class="pagination">
20 <a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-36">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a> 20 <a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-36">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a>
21 <i class="btn-clickable download-btn material-icons md-36">file_download</i> 21 <i class="btn-clickable download-btn material-icons md-36 js-export-action">file_download</i>
22 <i class="btn-clickable filter-btn material-icons md-36">filter_list</i> 22 <i class="btn-clickable filter-btn material-icons md-36 js-filters-action">filter_list</i>
23 {% if entries.getNbPages > 1 %} 23 {% if entries.getNbPages > 1 %}
24 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} 24 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
25 {% endif %} 25 {% endif %}
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 e0d36738..d9fb5d73 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -92,12 +92,12 @@
92 </a> 92 </a>
93 </li> 93 </li>
94 <li id="button_filters"> 94 <li id="button_filters">
95 <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"> 95 <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters">
96 <i class="material-icons">filter_list</i> 96 <i class="material-icons">filter_list</i>
97 </a> 97 </a>
98 </li> 98 </li>
99 <li id="button_export"> 99 <li id="button_export">
100 <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"> 100 <a class="nav-panel-menu button-collapse-right tooltipped js-export-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export">
101 <i class="material-icons">file_download</i> 101 <i class="material-icons">file_download</i>
102 </a> 102 </a>
103 </li> 103 </li>