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 1eb16439a8..73329e001d 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -4239,7 +4239,6 @@ span { // ==== MODULE LINKS - End ==== -<<<<<<< HEAD #catalog-search-link { border-right: 1px solid lighten( #E6F0F2, 15% ); padding-right: .3em; @@ -4259,7 +4258,7 @@ span { border-left: 1px solid darken( #B4D2D8, 15% ); } } -======= +} .adlibris-cover { max-height: 120px; @@ -4267,7 +4266,6 @@ span { .adlibris-cover-big { max-height: 200px; ->>>>>>> Bug 8630 - Adlibris covers (intranet CSS) } #tools_holidays { diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss index 398b6c100d..5db72ee5ca 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -3244,5 +3244,12 @@ button.closebtn { } } +.adlibris-cover { + max-height: 120px; +} + +.adlibris-cover-big { + max-height: 200px; +} @import "responsive";