From 1a8784870ddfd59b7612aca2b296188520969af5 Mon Sep 17 00:00:00 2001 From: Martin Persson 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 Signed-off-by: Katrin Fischer --- 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 d425b84..75dbd1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -4238,7 +4238,6 @@ span { // ==== MODULE LINKS - End ==== -<<<<<<< HEAD #catalog-search-link { border-right: 1px solid lighten( #E6F0F2, 15% ); padding-right: .3em; @@ -4258,7 +4257,7 @@ span { border-left: 1px solid darken( #B4D2D8, 15% ); } } -======= +} .adlibris-cover { max-height: 120px; @@ -4266,7 +4265,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 042406b..ddab70a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -3018,4 +3018,12 @@ button.closebtn { } } +.adlibris-cover { + max-height: 120px; +} + +.adlibris-cover-big { + max-height: 200px; +} + @import "responsive"; -- 2.1.4