From d4fd8b665b86c1d0e3be948b12289cc8180d8931 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
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 9cc01325f9..9f83e2d985 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 -%]
-    <ul>
+    <ul class="columns-3">
 
         [% IF v == 'release' %]
-            <p>This is the team who were responsible for the initial release of your currently installed Koha version.</p>
-
-            <li><strong>Release manager:</strong>
+            <li>
+                This is the team who were responsible for the initial release of your currently installed Koha version.
+            </li>
+            <li>
+                <strong>Release manager:</strong>
                 [% INCLUDE person p=t.manager %]
             </li>
 
@@ -63,11 +65,9 @@
             [% END %]
 
         [% ELSE %]
-            <p>This is the team who are responsible for the next release of Koha and the ongoing maintenance of your
-            currently installed Koha version. They will be in these roles up until <strong>[% t.release_date | $KohaDates %]</strong>, when the next
-            team will be elected.</p>
-
-            <li><strong>Release maintainer:</strong>
+            <li>
+                <p>This is the team who are responsible for the next release of Koha and the ongoing maintenance of your currently installed Koha version. They will be in these roles up until <strong>[% t.release_date | $KohaDates %]</strong>, when the next team will be elected.</p>
+                <strong>Release maintainer:</strong>
                 <ul>
                   [% FOREACH m IN t.maintainer %]
                     [% IF m.version == ( v - 0.01 ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index ff235b589c..4706d03f8b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -406,7 +406,7 @@
 
             <h2>Koha release teams</h2>
             <div class="row">
-                <div class="col-md-6">
+                <div class="col-md-12">
                     <h3>Koha [% short_version | html %] release team</h3>
                     [% IF development_version %]
                         <p>You are running a development version of Koha</p>
@@ -414,8 +414,9 @@
                         [% INCLUDE team t=release_team v='release' %]
                     [% END %]
                 </div>
-
-                <div class="col-md-6">
+            </div>
+            <div class="row">
+                <div class="col-md-12">
                     <h3>Current maintenance team</h3>
                     [% INCLUDE team t=maintenance_team v=short_version %]
                 </div>
-- 
2.20.1