From de223dca7adfcf0d7ea754195e1590e0878226d8 Mon Sep 17 00:00:00 2001
From: Martin Persson <xarragon@gmail.com>
Date: Wed, 7 Oct 2015 16:42:57 +0200
Subject: [PATCH] Bug 8630: Adlibris covers (OPAC SCSS changes)

This patch adds two new CSS classes specific to Adlibris covers.

Sponsored-By: Halland County Library

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
---
 koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 4 +---
 koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss        | 8 ++++++++
 2 files changed, 9 insertions(+), 3 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 3e0e247..b07de95 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -4121,7 +4121,6 @@ span {
 
 // ==== MODULE LINKS - End ====
 
-<<<<<<< HEAD
 #catalog-search-link {
     border-right: 1px solid lighten( #E6F0F2, 15% );
     padding-right: .3em;
@@ -4141,7 +4140,7 @@ span {
             border-left: 1px solid darken( #B4D2D8, 15% );
         }
     }
-=======
+}
 
 .adlibris-cover {
     max-height: 120px;
@@ -4149,7 +4148,6 @@ span {
 
 .adlibris-cover-big {
     max-height: 200px;
->>>>>>> Bug 8630 - Adlibris covers (intranet CSS)
 }
 
 @media (min-width: 200px) {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
index c5075d5..30aac2c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
@@ -3016,4 +3016,12 @@ button.closebtn {
     }
 }
 
+.adlibris-cover {
+    max-height: 120px;
+}
+
+.adlibris-cover-big {
+    max-height: 200px;
+}
+
 @import "responsive";
-- 
2.1.4