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 <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

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 d3e37df..1eb1643 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -4239,6 +4239,7 @@ span {
 
 // ==== MODULE LINKS - End ====
 
+<<<<<<< HEAD
 #catalog-search-link {
     border-right: 1px solid lighten( #E6F0F2, 15% );
     padding-right: .3em;
@@ -4258,6 +4259,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)
 }
 
 #tools_holidays {