From 488f6ca085cd28d2b71dea51736d0648765fef97 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 3 Feb 2023 18:22:45 +0000 Subject: [PATCH] Bug 32605: (follow-up) Additional fixes This patch makes some further changes to form CSS in order to improve consistency. Some templates have also been modified to improve layout. - Acquisitions -> New vendor - Staff interface home -> Patrons requesting modifications - Reports -> Saved SQL reports - Serials -> New subscription - Tools -> Import patrons Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 898aeaad9a095d1ebf5c64cee0ca2d16b57dfade) Signed-off-by: Pedro Amorim --- .../intranet-tmpl/prog/css/src/_forms.scss | 37 +++++++------------ .../prog/css/src/staff-global.scss | 3 +- .../prog/en/modules/acqui/supplier.tt | 8 ++-- .../prog/en/modules/members/members-update.tt | 12 +++--- .../modules/reports/guided_reports_start.tt | 4 +- .../en/modules/serials/subscription-add.tt | 24 ++++++------ .../prog/en/modules/tools/import_borrowers.tt | 4 +- 7 files changed, 41 insertions(+), 51 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss index d9d7caa54c..99f8adfbca 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss @@ -6,7 +6,7 @@ fieldset { color: #696969; float: left; font-weight: bold; - margin-bottom: 0; + margin-bottom: .5rem; ~ * { clear: left; @@ -17,9 +17,7 @@ fieldset { box-shadow: none; padding: 0; } -} -fieldset { &.rows { clear: left; float: left; @@ -40,10 +38,9 @@ fieldset { &.inputnote { clear: left; float: left; - margin: 1em 0 0 11em; + margin: 1em 0 0 9em; } - &.left { label { text-align: left; @@ -62,18 +59,6 @@ fieldset { } } - &.ui-accordion-content { - border-top-left-radius: 0; - border-top-right-radius: 0; - margin: 0; - padding: 0; - width: 100%; - - table { - margin: 0; - } - } - &.unselected { background-color: #FFFFFF; border: 0; @@ -86,7 +71,7 @@ fieldset { div { &.hint { - font-size: 105%; + font-size: 1.25rem; margin: .5rem 0; margin-left: 11rem; } @@ -113,7 +98,8 @@ fieldset { &.radio { display: inline-block; - margin: 0 1rem 0 0; + float: none; + margin: 0; padding: 0; width: auto; } @@ -163,14 +149,19 @@ fieldset { } fieldset { - margin-left: 7.5em; + margin: 0; + padding: 0; + + input[type="text"] { + max-width: 70%; + } label { width: 6em; } legend { - font-size: 120%; + font-size: 1.55rem; margin: 0 0 0 1em; } @@ -230,13 +221,13 @@ fieldset { } &.hint { - font-size: 105%; + font-size: 1.25rem; } } table { clear: both; - font-size: 105%; + font-size: 1.25rem; margin: 1em 0 1em 1em; &.dataTable { 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 baf0ff7b73..e2730484f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -587,8 +587,7 @@ input { &[type="checkbox"], &[type="radio"] { height: unset; - margin: 0; - vertical-align: middle; + margin: 3px 3px 0 5px; } &.submit { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 1490095213..0a49619121 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -201,15 +201,15 @@ Ordering information
  1. [% IF ( active ) %] - - + + [% ELSE %] - - + + [% END %]
  2. - - - + - - + + + + + | Patron details diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index 0d4dd73384..e1247b0420 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -2352,7 +2352,7 @@ - + - +
  3. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt index 138d7cbba7..e6918de53f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt @@ -14,7 +14,7 @@ fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ /* Prevents Bootstrap menus from being hidden inside modal */ #mana_search_result .modal { overflow: visible; } #mana_search_result .modal-body { overflow-y: visible; } -.inputnote { padding-left: 13rem; padding-top: 1rem; } + fieldset.rows table { clear: none; margin: 0; } @@ -107,32 +107,32 @@ fieldset.rows table { clear: none; margin: 0; } [% END %] -
  4. - +
  5. + When receiving this serial: [% IF ( serialsadditems ) %] - + - + [% ELSE %] - + - + [% END %]
  6. -
  7. +
  8. [% IF (skip_serialseq) %] - + - + [% ELSE %] - + - + [% END %]
  9. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt index 2beeaaa0ad..f271fc58ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt @@ -309,7 +309,7 @@
-
+
If matching record is already in the borrowers table:
    @@ -338,7 +338,7 @@
[% IF ( Koha.Preference('ExtendedPatronAttributes') == 1 ) %] -
+
Patron attributes
    -- 2.39.5