View | Details | Raw Unified | Return to bug 8630
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-1 / +10 lines)
Lines 4238-4243 span { Link Here
4238
4238
4239
// ==== MODULE LINKS - End ====
4239
// ==== MODULE LINKS - End ====
4240
4240
4241
<<<<<<< HEAD
4241
#catalog-search-link {
4242
#catalog-search-link {
4242
    border-right: 1px solid lighten( #E6F0F2, 15% );
4243
    border-right: 1px solid lighten( #E6F0F2, 15% );
4243
    padding-right: .3em;
4244
    padding-right: .3em;
Lines 4257-4262 span { Link Here
4257
            border-left: 1px solid darken( #B4D2D8, 15% );
4258
            border-left: 1px solid darken( #B4D2D8, 15% );
4258
        }
4259
        }
4259
    }
4260
    }
4261
=======
4262
4263
.adlibris-cover {
4264
    max-height: 120px;
4265
}
4266
4267
.adlibris-cover-big {
4268
    max-height: 200px;
4269
>>>>>>> Bug 8630 - Adlibris covers (intranet CSS)
4260
}
4270
}
4261
4271
4262
@media (min-width: 200px) {
4272
@media (min-width: 200px) {
4263
- 

Return to bug 8630