From 2c5cd4ffbe762164cfcf5d603e926fe177bb642c 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. Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit b65efd3f224342be8e751e54f7ada8fc482755bb) Signed-off-by: Lucas Gass --- .../intranet-tmpl/prog/css/src/staff-global.scss | 11 +++++++++++ koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) 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 b55b97eea8..ccb2b081c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -893,6 +893,10 @@ fieldset { font-size: 105%; margin: 1em 0 1em 1em; + &.dataTable { + margin: 0; + } + &.mceListBox { margin: 0; } @@ -916,6 +920,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 87cbd926a5..1fda1baa55 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt @@ -261,7 +261,6 @@ "bPaginate": false, "bFilter": false, "bInfo": false, - "bAutoWidth": false, "aoColumnDefs": [{ "aTargets": [-3], "bSortable": false, @@ -336,6 +335,7 @@ "aaSorting": [[ 0, "asc" ]], "paginationType": "full", })); + }, items_columns_settings, false); $(".add_button").on("click", function(e) { e.preventDefault(); -- 2.39.5