From 4f9ea23bff95beafa430f6990456343e27a38bba Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 10 May 2019 14:36:12 +0000 Subject: [PATCH] Bug 21626: (follow-up) Minor tweaks to the columns formatting This patch makes minor markup and CSS changes to improve the column-formatting of team data. The primary goal of these changes is to avoid showing a large blank space when using a development version. Some text has been moved around to avoid validation errors. To test, apply the patch and rebuild the staff client CSS. Release and maintenance team information should be displayed in 3-column sets. The information should look well-formatted when using a development or non-development version. --- .../prog/css/src/staff-global.scss | 12 ++++++++++-- .../prog/en/includes/about-team.inc | 18 +++++++++--------- .../intranet-tmpl/prog/en/modules/about.tt | 7 ++++--- 3 files changed, 23 insertions(+), 14 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 0ac6b70d48..10f6388da4 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -4305,13 +4305,21 @@ input.renew { } .columns-3 { - columns: 3 auto; column-gap: 2.5em; + columns: 3 auto; + + li { + break-inside: avoid; + } } .columns-4 { - columns: 4 auto; column-gap: 2em; + columns: 4 auto; + + li { + break-inside: avoid; + } } // ==== MODULE LINKS - End ==== diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc index 94636470db..a02fe5442d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc @@ -39,12 +39,14 @@ [%- END -%] [%- BLOCK team -%] -