@@ -, +, @@ --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -4121,6 +4121,7 @@ span { // ==== MODULE LINKS - End ==== +<<<<<<< HEAD #catalog-search-link { border-right: 1px solid lighten( #E6F0F2, 15% ); padding-right: .3em; @@ -4140,6 +4141,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) { --