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