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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-3 / +1 lines)
Lines 4121-4127 span { Link Here
4121
4121
4122
// ==== MODULE LINKS - End ====
4122
// ==== MODULE LINKS - End ====
4123
4123
4124
<<<<<<< HEAD
4125
#catalog-search-link {
4124
#catalog-search-link {
4126
    border-right: 1px solid lighten( #E6F0F2, 15% );
4125
    border-right: 1px solid lighten( #E6F0F2, 15% );
4127
    padding-right: .3em;
4126
    padding-right: .3em;
Lines 4141-4147 span { Link Here
4141
            border-left: 1px solid darken( #B4D2D8, 15% );
4140
            border-left: 1px solid darken( #B4D2D8, 15% );
4142
        }
4141
        }
4143
    }
4142
    }
4144
=======
4143
}
4145
4144
4146
.adlibris-cover {
4145
.adlibris-cover {
4147
    max-height: 120px;
4146
    max-height: 120px;
Lines 4149-4155 span { Link Here
4149
4148
4150
.adlibris-cover-big {
4149
.adlibris-cover-big {
4151
    max-height: 200px;
4150
    max-height: 200px;
4152
>>>>>>> Bug 8630 - Adlibris covers (intranet CSS)
4153
}
4151
}
4154
4152
4155
@media (min-width: 200px) {
4153
@media (min-width: 200px) {
(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss (-1 / +8 lines)
Lines 3016-3019 button.closebtn { Link Here
3016
    }
3016
    }
3017
}
3017
}
3018
3018
3019
.adlibris-cover {
3020
    max-height: 120px;
3021
}
3022
3023
.adlibris-cover-big {
3024
    max-height: 200px;
3025
}
3026
3019
@import "responsive";
3027
@import "responsive";
3020
- 

Return to bug 8630