From 5eb534fd946c276f45b853557620e062c00f1824 Mon Sep 17 00:00:00 2001 From: Devinim Date: Fri, 18 Oct 2019 13:51:55 +0000 Subject: [PATCH] Bug 22773: (follow-up) Recommended changes are made on datatable and butons Signed-off-by: Kelly McElligott Signed-off-by: Christopher Kellermeyer --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 4 ---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 7 ++++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 5e02ed1d3c..59ef8afd6c 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -3498,10 +3498,6 @@ span { margin: 1em auto; } -#merge { - margin: .5em 0 0; -} - #merge_table { tr { &.active { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index 9065e0dbea..7f5e08ac2a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -103,9 +103,9 @@ Merge selected invoices [% IF tab == 'closed' %] - Reopen selected invoices + Reopen selected invoices [% ELSE %] - Close selected invoices + Close selected invoices [% END %] [% END %] @@ -353,7 +353,8 @@ { "bSortable": false, "aTargets": [1, -1] }, { "bVisible": false, "aTargets": [0] }, { "sType": "title-string", "aTargets" : [ "title-string" ] } - ] + ], + autoWidth: false })); $("#show_only_subscription").prop("checked", false); -- 2.11.0