Attachment 89557 Details for Bug 21626 – Bug 21626: (follow-up) Minor tweaks to the columns formatting

[patch] Bug 21626: (follow-up) Minor tweaks to the columns formatting

Bug-21626-follow-up-Minor-tweaks-to-the-columns-fo.patch (text/plain), 4.38 KB, created by Owen Leonard on 2019-05-10 15:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2019-05-10 15:00:00 UTC

Size: 4.38 KB

patch

obsolete

>From f6d045711491fca26b7c1089c92627269fa64b6c 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.
>---
> koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 12 ++++++++++--
> .../intranet-tmpl/prog/en/includes/about-team.inc      | 18 +++++++++---------
> koha-tmpl/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 0ac6b70..10f6388 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 9463647..a02fe54 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 %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>index ff235b5..4706d03 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.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 21626: 80968 | 87776 | 87777 | 88483 | 88484 | 88880 | 88881 | 88882 | 88883 | 88884 | 88885 | 88886 | 88890 | 88891 | 89185 | 89186 | 89206 | 89207 | 89216 | 89217 | 89253 | 89281 | 89282 | 89283 | 89295 | 89296 | 89297 | 89298 | 89299 | 89307 | 89308 | 89309 | 89310 | 89311 | 89552 | 89553 | 89554 | 89555 | 89556 | 89557 | 89681 | 89682 | 89683 | 89684 | 89685 | 89686 | 89687 | 89690 | 89691 | 89692 | 89693 | 89694 | 89695 | 89696 | 89697 | 89698 | 89699 | 89700 | 89701 | 89702 | 89703 | 89704 | 89705 | 89713 | 89714 | 89715 | 89716 | 89717 | 89718 | 89719 | 89720 | 89750 | 89751 | 89752 | 89753 | 89754 | 89755 | 89756 | 89757 | 89758 | 89759 | 89771 | 89772 | 89773 | 89774 | 89775 | 89776 | 89777 | 89778 | 89779 | 89780