diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-06-13 23:21:55 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2020-04-28 10:13:57 +0200 |
commit | 6104e652ec8c8c72051f4e6763ae670d2ac099dc (patch) | |
tree | 85ef6049285dc37c0be676511c2d36860ca15d60 | |
parent | 136f710ddb48f01e24892c5d2dde3b1f3a069fc4 (diff) | |
download | wallabag-6104e652ec8c8c72051f4e6763ae670d2ac099dc.tar.gz wallabag-6104e652ec8c8c72051f4e6763ae670d2ac099dc.tar.zst wallabag-6104e652ec8c8c72051f4e6763ae670d2ac099dc.zip |
Fix displaying sidenav
3 files changed, 5 insertions, 1 deletions
diff --git a/app/Resources/static/themes/material/css/nav.scss b/app/Resources/static/themes/material/css/nav.scss index c84f7957..df1e67e8 100644 --- a/app/Resources/static/themes/material/css/nav.scss +++ b/app/Resources/static/themes/material/css/nav.scss | |||
@@ -136,6 +136,10 @@ nav { | |||
136 | top: 0; | 136 | top: 0; |
137 | } | 137 | } |
138 | 138 | ||
139 | #button_sort { | ||
140 | display: none; | ||
141 | } | ||
142 | |||
139 | @media (min-width: 993px) { | 143 | @media (min-width: 993px) { |
140 | .button-collapse { | 144 | .button-collapse { |
141 | display: none; | 145 | display: none; |
diff --git a/app/Resources/static/themes/material/js/tools.js b/app/Resources/static/themes/material/js/tools.js index 8563a14a..8b1f8bda 100644 --- a/app/Resources/static/themes/material/js/tools.js +++ b/app/Resources/static/themes/material/js/tools.js | |||
@@ -33,6 +33,7 @@ function initSort() { | |||
33 | // no display if export (ie: entries) not available | 33 | // no display if export (ie: entries) not available |
34 | if ($('div').is('#sort')) { | 34 | if ($('div').is('#sort')) { |
35 | $('#button_sort').show(); | 35 | $('#button_sort').show(); |
36 | $('.js-sort-action').sideNav({ edge: 'right' }); | ||
36 | } | 37 | } |
37 | } | 38 | } |
38 | 39 | ||
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 1654a0e0..e6497893 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 | |||
@@ -101,7 +101,6 @@ | |||
101 | {% if form is not null %} | 101 | {% if form is not null %} |
102 | <div id="filters" class="side-nav right-aligned"> | 102 | <div id="filters" class="side-nav right-aligned"> |
103 | <form action="{{ path('all') }}"> | 103 | <form action="{{ path('all') }}"> |
104 | |||
105 | <h4 class="center">{{ 'entry.filters.title'|trans }}</h4> | 104 | <h4 class="center">{{ 'entry.filters.title'|trans }}</h4> |
106 | 105 | ||
107 | <div class="row"> | 106 | <div class="row"> |