From cfd0de34cd65f8cd85b38e6841bc92d94fdfa743 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 12 Sep 2018 16:33:48 +0000 Subject: [PATCH] Bug 20809: (follow-up) Corrections to CSS and JS This follow-up modifies JavaScript so that the confirmation dialog is triggered when deleting a patron image from the modal window. The CSS is modified to improve the alignment of patron image and edit button. Signed-off-by: Claire Gravely Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 5 +++-- .../intranet-tmpl/prog/en/includes/str/members-menu.inc | 15 ++++++++++++++- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 16 ++-------------- 3 files changed, 19 insertions(+), 17 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 48ae4b913a..d260b6c9f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1709,15 +1709,16 @@ dd { } .patronimage { + border: 1px solid #EEE; display: block; max-width: 160px; + margin: auto; opacity: 1; transition: .2s ease; - .empty { + &.empty { background: transparent url( "../img/patron-blank.min.svg" ) center 5px no-repeat; height: 125px; - margin: .3em 0 .3em .3em; padding: 0; width: 80%; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc index 703930cd25..2d5ebfe588 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc @@ -2,7 +2,7 @@ [% USE Koha %] [% USE Categories %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 6e15e3c4d1..f56341f870 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -269,9 +269,9 @@ [% END %]