From: Nicolas Lœuillet Date: Fri, 30 Dec 2016 14:45:19 +0000 (+0100) Subject: Merge pull request #2735 from wallabag/remove-small-readingtime X-Git-Tag: 2.2.0~3^2~9 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=cace43dd7ba27b3e26497ada1e62718c817ea735;hp=70d99765c78d92835e15b8114a1c9d7e68e5a7f0;p=github%2Fwallabag%2Fwallabag.git Merge pull request #2735 from wallabag/remove-small-readingtime Removed the small element on reading time --- diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 568b2dce..cee84fa8 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -35,7 +35,7 @@ function initFilters() { // no display if filters not available if ($('div').is('#filters')) { $('#button_filters').show(); - $('.button-collapse-right').sideNav({ edge: 'right' }); + $('.js-filters-action').sideNav({ edge: 'right' }); $('#clear_form_filters').on('click', () => { $('#filters input').val(''); $('#filters :checked').removeAttr('checked'); @@ -48,7 +48,7 @@ function initExport() { // no display if export not available if ($('div').is('#export')) { $('#button_export').show(); - $('.button-collapse-right').sideNav({ edge: 'right' }); + $('.js-export-action').sideNav({ edge: 'right' }); } } diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index c6b7326d..f43e6042 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -304,7 +304,7 @@ nav { .nav-panel-buttom { display: flex; flex-grow: 1; - justify-content: right; + justify-content: flex-end; } .nav-panel-buttom li { @@ -439,7 +439,6 @@ nav ul a:hover { .side-nav.fixed.right-aligned { right: -250px; left: auto !important; - overflow-y: visible; } #filters div.with-checkbox { 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 @@
{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}