From 5046ab72be0acc4f4f7ad36f6d1779a2883c5f7d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 5 Oct 2018 13:56:12 +0000 Subject: [PATCH] Bug 8630: Adlibris covers (intranet CSS) This defined two new CSS classes for use by the intranet templates. Apply this patch before doing the testing of "intranet templates". Sponsored-By: Halland County Library Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 8fc9058..d425b84 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -4238,6 +4238,7 @@ span { // ==== MODULE LINKS - End ==== +<<<<<<< HEAD #catalog-search-link { border-right: 1px solid lighten( #E6F0F2, 15% ); padding-right: .3em; @@ -4257,6 +4258,15 @@ span { border-left: 1px solid darken( #B4D2D8, 15% ); } } +======= + +.adlibris-cover { + max-height: 120px; +} + +.adlibris-cover-big { + max-height: 200px; +>>>>>>> Bug 8630 - Adlibris covers (intranet CSS) } @media (min-width: 200px) { -- 2.1.4