diff --git a/themes/bootprint3/scss/bootprint.scss b/themes/bootprint3/scss/bootprint.scss index 9e3b4232449d4d9772d1212cf958190cb4245128..c9b8e98ed7ba427cc052ea553c2e8342418411a0 100644 --- a/themes/bootprint3/scss/bootprint.scss +++ b/themes/bootprint3/scss/bootprint.scss @@ -164,5 +164,5 @@ ul.random.image li img { margin: 0 auto; } color: #fff; &:hover { color: $brand-danger; } } -.jstree-facet .jstree-ocl::before { margin-left: -5px; } +.jstree-facet .facet { padding: 0; } .jstree-node.active { background-color: $active-orange; } diff --git a/themes/bootstrap3/scss/bootstrap.scss b/themes/bootstrap3/scss/bootstrap.scss index fc5042b4c9c76a12550f9745a92365463b1144cc..5433b8e62e22a5dc822b091b7b033f60809f3df5 100644 --- a/themes/bootstrap3/scss/bootstrap.scss +++ b/themes/bootstrap3/scss/bootstrap.scss @@ -297,3 +297,41 @@ span[class^="services-"], span[class*=" services-"] span::before { content: ", "; } span[class^="services-"], span[class*=" services-"] span:first-of-type::before { content: ""; } + +/* --- extended holdings --- */ + +div.holding-details { + display: flex; + + .holding-field { + flex: 1 1 0; + padding-left: 0.5rem; + padding-right: 0.5rem; + } + + .holding-field.barcode, + .holding-field.place-hold, + .holding-field.storage-retrieval, + .holding-field.ill-request, + .holding-field.recall { + flex: 1 1 0; + } + + .holding-field.availability{ + flex: 2 1 0; + } + + .due-date:before { + content: "\2013"; + padding-right: 0.3em; + } + + .due-date { + white-space: nowrap; + } +} + +div.holding-notes { + padding-left: 0.5rem; + padding-right: 0.5rem; +} diff --git a/themes/bootstrap3/scss/components/js-tree.scss b/themes/bootstrap3/scss/components/js-tree.scss index af94c3a0b1c550f6c1d670ee488a4297fb71226d..03b7358f2bfecbcf99599e8d07e66d89b064fcf9 100644 --- a/themes/bootstrap3/scss/components/js-tree.scss +++ b/themes/bootstrap3/scss/components/js-tree.scss @@ -48,8 +48,6 @@ } .jstree-initial-node {display: none;} .jstree-clicked { - color: $list-group-active-color; - background-color: $list-group-active-bg; .jstree-icon { color: #fff; } @@ -106,13 +104,11 @@ margin-top: 2px; margin-right: 4px; } -.jstree-facet .jstree-container-ul { - padding: 0; - & > li.active, - & > li.active a.jstree-anchor { - background-color: #265680; - color: #fff; - } +.jstree-facet .jstree-container-ul { padding: 0; } +.jstree-facet .active, +.jstree-facet .active a.jstree-anchor { + background-color: $list-group-active-bg; + color: #fff; } li.jstree-facet, li.jstree-node { list-style: none; } diff --git a/themes/bootstrap3/scss/components/sidebar.scss b/themes/bootstrap3/scss/components/sidebar.scss index fbc4326e837eeb375994d3bce1951046d62802f1..9c51e5151652df245e4a1f1e8e3038c36d69cc5d 100644 --- a/themes/bootstrap3/scss/components/sidebar.scss +++ b/themes/bootstrap3/scss/components/sidebar.scss @@ -90,9 +90,10 @@ .active-filters .facet, .facet-group .active { - background-color: $brand-primary; + background-color: $list-group-active-bg; color: #fff; + .jstree-icon, a { color: #fff; } } .facet.active .badge, @@ -126,3 +127,20 @@ margin-left: 0.5rem; } body.rtl .full-facet-list .active .fa { float: left; } + +.jstree-node { + .facet { + padding: 0; + border: none; + } +} +.jstree-facet { + .jstree-anchor { + padding: 0; + } + .list-group-item { + padding-right: 0; + border: 0; + border-bottom: 1px solid $list-group-border; + } +} diff --git a/themes/sandal/scss/colors.scss b/themes/sandal/scss/colors.scss index d942e58b6bda013b2455c0a901592e93fd175383..59d6aa824cd02cdf4950894520ceebacfad013d9 100644 --- a/themes/sandal/scss/colors.scss +++ b/themes/sandal/scss/colors.scss @@ -45,5 +45,6 @@ $input-border-radius: .25rem !default; $autocomplete-hover-bg: $header-light !default; $dropdown-link-hover-bg: $header-light !default; $dropdown-link-hover-color: $black !default; +$list-group-active-bg: $brand-secondary !default; $table-bg-hover: $header-light !default; $pagination-color: $header-bg !default; diff --git a/themes/sandal/scss/sandal.scss b/themes/sandal/scss/sandal.scss index 6a3086916aca544af7a19e6b43fe027e05c1871b..5d34610ba2c5608a3d52d84d2a10f02b8d4c906d 100644 --- a/themes/sandal/scss/sandal.scss +++ b/themes/sandal/scss/sandal.scss @@ -165,6 +165,8 @@ header { .facet-group { margin-left: 1rem; margin-right: 1rem; + background-color: $sidebar-item-bg; + color: $sidebar-item-color; } /* Collapsed arrows */ .facet-group .title { @@ -182,10 +184,6 @@ header { .active-filters .title::after, #advSearchForm & .title:after { content: none; } // No arrow on active filter title - .facet { - background-color: $sidebar-item-bg; - color: $sidebar-item-color; - } a.facet:hover, .facet.checkbox:hover { background-color: $sidebar-item-hover-bg; } @@ -193,6 +191,7 @@ header { .facet.active:hover, .active-filters .facet, .active-filters .facet:hover, + .active .jstree-anchor, .jstree-facet .jstree-container-ul > .active { border-color: $sidebar-active-bg; background-color: $sidebar-active-bg; @@ -219,7 +218,11 @@ header { .sidebar .checkbox-filter, .sidebar > h4 { margin-left: 1rem; } -.jstree-facet .main .fa-check { margin-top: 3px; } +.jstree-facet { + .main .fa-check { margin-top: 3px; } + .jstree-icon::before { margin-top: 2px; } +} + @media (min-width: 768px) and (max-width: 991px) { .sidebar .facet { flex-flow: wrap;