devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-15 09:57:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix double overlay on expanded right sidenav

Browse Source
This commit is contained in:
Simounet 2016-12-29 19:17:36 +01:00
parent 339b1e689d
commit ccb9e79a35
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Resources/static/themes/_global/js/tools.js
View File

@ -35,7 +35,7 @@ function initFilters() {
// no display if filters not available // no display if filters not available
if ($('div').is('#filters')) { if ($('div').is('#filters')) {
$('#button_filters').show(); $('#button_filters').show();
$('.button-collapse-right').sideNav({ edge: 'right' }); $('.js-filters-action').sideNav({ edge: 'right' });
$('#clear_form_filters').on('click', () => { $('#clear_form_filters').on('click', () => {
$('#filters input').val(''); $('#filters input').val('');
$('#filters :checked').removeAttr('checked'); $('#filters :checked').removeAttr('checked');
@ -48,7 +48,7 @@ function initExport() {
// no display if export not available // no display if export not available
if ($('div').is('#export')) { if ($('div').is('#export')) {
$('#button_export').show(); $('#button_export').show();
$('.button-collapse-right').sideNav({ edge: 'right' }); $('.js-export-action').sideNav({ edge: 'right' });
} }
} }

4
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
View File

@ -18,8 +18,8 @@
<div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
<div class="pagination"> <div class="pagination">
<a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-36">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a> <a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-36">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a>
<i class="btn-clickable download-btn material-icons md-36">file_download</i> <i class="btn-clickable download-btn material-icons md-36 js-export-action">file_download</i>
<i class="btn-clickable filter-btn material-icons md-36">filter_list</i> <i class="btn-clickable filter-btn material-icons md-36 js-filters-action">filter_list</i>
{% if entries.getNbPages > 1 %} {% if entries.getNbPages > 1 %}
{{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
{% endif %} {% endif %}

4
src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
View File

@ -92,12 +92,12 @@
</a> </a>
</li> </li>
<li id="button_filters"> <li id="button_filters">
<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"> <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">
<i class="material-icons">filter_list</i> <i class="material-icons">filter_list</i>
</a> </a>
</li> </li>
<li id="button_export"> <li id="button_export">
<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"> <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">
<i class="material-icons">file_download</i> <i class="material-icons">file_download</i>
</a> </a>
</li> </li>

2
web/bundles/wallabagcore/themes/baggy/js/baggy.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
web/bundles/wallabagcore/themes/material/js/material.min.js vendored
View File

File diff suppressed because one or more lines are too long