From f4a7bf0d8fd75cb61768e2c016b89324b199f963 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 12 Aug 2020 13:58:58 +0100 Subject: [PATCH] Bug 26189: Improve styling of datatables within fieldsets Unset label width restriction: The label width restriction within fieldsets causes issues for the datatables header. Unsetting it explicitly here resolves the line wrapping issues :) Reset margins for datatables found inside fieldsets such that the datatable properly utilises the available space and restore the default datatable label font weights. --- .../intranet-tmpl/prog/css/src/staff-global.scss | 11 +++++++++++ koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 3 +-- 2 files changed, 12 insertions(+), 2 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 e339309288..64f79cd349 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -898,6 +898,10 @@ fieldset { font-size: 105%; margin: 1em 0 1em 1em; + &.dataTable { + margin: 0; + } + &.mceListBox { margin: 0; } @@ -921,6 +925,13 @@ fieldset { clear: both; padding-top: .5em; } + + .dataTables_wrapper { + label { + font-weight: 400; + width: unset; + } + } } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt index 663c6d6023..9cbb74638b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt @@ -271,7 +271,6 @@ "bPaginate": false, "bFilter": false, "bInfo": false, - "bAutoWidth": false, "aoColumnDefs": [{ "aTargets": [-3], "bSortable": false, @@ -343,7 +342,7 @@ var items_table = KohaTable("invoices", { "sPaginationType": "full", "aaSorting": [[ 0, "asc" ]], - }, items_columns_settings); + }, items_columns_settings, false); $(".add_button").on("click", function(e) { e.preventDefault(); -- 2.20.1