From cf45e67328106e7d0c7978e094e97b5943eca4a6 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Tue, 10 Jan 2017 12:21:05 +0000 Subject: [PATCH] Bug 17874: Bug 16239 followup - polishing things This patch is made on top of bug 16239 to polish things. Makes these changes: - Buttons on add circulation message modal - Dropdowns has top and bottom margin 4px instead of 3px - btn-link class (for example in toolbar on advanced search pages) - Delete circ message is btn-link - Add new circ message is btn-link Test plan: - Confirm that all changes are as described above and that they make sense Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 9 +++++++++ koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index 41c9f9c..20ce983 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -2404,6 +2404,11 @@ a.btn:visited{ color: #333333; } +a.btn-link:link, +a.btn-link:visited { + color: #004d99; +} + a.btn-link:hover { color : #538200; } @@ -2420,6 +2425,10 @@ a.dropdown-toggle { white-space: nowrap; } +.dropdown-menu > li > a { + padding: 4px 20px; +} + .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { text-decoration: none; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index a1760c3..68dd762 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -248,8 +248,8 @@ function searchToHold(){ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 3d2b567..af88d33 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -865,12 +865,12 @@ No patron matched [% message | html %] "[% message.message %]" [% IF message.branchcode == branch OR Koha.Preference('AllowAllMessageDeletion') %] - Delete + Delete [% END %] [% END %] - Add a new message + Add a new message -- 2.9.3