diff --git a/local/alpha/config/vufind/config.ini b/local/alpha/config/vufind/config.ini
index 7f9b82ebb3707e67b38376f6db9741e177a2a18e..66ed3f847907b8c5d75f20f38d313556d536d3b1 100644
--- a/local/alpha/config/vufind/config.ini
+++ b/local/alpha/config/vufind/config.ini
@@ -27,9 +27,9 @@ debug = false
[Index]
;url = http://localhost:8080/solr
; Solr4Entwickler
-;url = http://172.18.113.12:8080/solr
+url = http://172.18.113.12:8080/solr
; Solr5Entwickler
-url = http://172.18.85.142:8983/solr
+;url = http://172.18.85.142:8983/solr
[Site]
url = "https://alpha.finc.info/vufind2/local"
diff --git a/local/alpha/config/vufind/searches.ini b/local/alpha/config/vufind/searches.ini
index 0cfdd64514a79917412c33d974d9313c2778335b..4b336851dfd3baad985d54f9411e8392426da448 100644
--- a/local/alpha/config/vufind/searches.ini
+++ b/local/alpha/config/vufind/searches.ini
@@ -24,10 +24,10 @@ relative_path = ../../../config/vufind/searches.ini
[IndexShards]
;finc-live = 172.18.113.250:8080/solr/biblio
;finc-nonlive = 172.18.113.250:8081/solr/biblio
-;solr4entw = 172.18.85.142:8085/solr/biblio
-solr5entwickler = "172.18.85.142:8983/solr/biblio"
-ai-live = ai.ub.uni-leipzig.de/solr/biblio
-;ai-nonlive = solr.ub.uni-leipzig.de/solr/biblio
+solr4entw = 172.18.85.142:8085/solr/biblio
+;solr5entwickler = "172.18.85.142:8983/solr/biblio"
+;ai-live = ai.ub.uni-leipzig.de/solr/biblio
+ai-nonlive = solr.ub.uni-leipzig.de/solr/biblio
;ai-dev = 172.18.113.22:8085/solr/biblio
;dbod_todo = 194.95.146.188:8080/solr/fincdbod
;dbodtodo = 141.39.229.20:9003/solr/fincdbod
diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss
index 8eed160a0c5dc1cfd3a870df76abe5c7b5a6f606..2f0d335a1c901b23f4d39cee0f4907c883d9e424 100644
--- a/themes/finc/scss/_customVariables.scss
+++ b/themes/finc/scss/_customVariables.scss
@@ -51,20 +51,20 @@ $black: #000;
//// defined like so '$alert-success-bg: $state-success-bg;')
$state-light-text-on-dark: $white !default;
-$state-success-text: $state-light-text-on-dark;
-$state-success-bg: $brand-success;
+$state-success-text: $state-light-text-on-dark !default;
+$state-success-bg: $brand-success !default;
//$state-success-border: darken(adjust-hue($state-success-bg, -10), 5%) !default;
-$state-info-text: $state-light-text-on-dark;
-$state-info-bg: $brand-info;
+$state-info-text: $state-light-text-on-dark !default;
+$state-info-bg: $brand-info !default;
// $state-info-border: darken(adjust-hue($state-info-bg, -10), 7%) !default;
-$state-warning-text: $state-light-text-on-dark;
-$state-warning-bg: $brand-warning;
+$state-warning-text: $state-light-text-on-dark !default;
+$state-warning-bg: $brand-warning !default;
// $state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%) !default;
-$state-danger-text: $state-light-text-on-dark; // NOTE: this renders the text white -- requires red background!
-$state-danger-bg: $brand-danger;
+$state-danger-text: $state-light-text-on-dark !default; // NOTE: this renders the text white -- requires red background!
+$state-danger-bg: $brand-danger !default;
// $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) !default;
//// ALERTS (see states, above, and compiled.scss - Code needs to go there to overwrite defaults)
@@ -109,6 +109,9 @@ $badge-color: $jet !default;
$badge-font-weight: normal !default;
$badge-link-color: $brand-primary !default;
$badge-link-hover-color: $brand-danger !default;
+////// Sidebar Badge/fa Colors
+$sidebar-badge-fa-color: darken($brand-secondary, 40%) !default;
+
//// Accordion/Collapse Toggler
$toggler: $snow !default;
@@ -153,7 +156,7 @@ $sidebar-item-active-hover-bg: transparentize($brand-primary, .1) !default;
// DIMENSIONS
//// The general gutter width (padding between columns) is calculated like so: '$grid-gutter-width / 2'
//// which gives you the left or right gutter width; this can be taken further by using '$grid-gutter-width / 1.5' etc
-$grid-gutter-width: 30px;
+$grid-gutter-width: 30px !default;
//// Navbar gets a minimum-height of 50px by default, activate and change here!
//// for fixed navbars, the body requires a padding-bottom of the same height as the navbar
diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss
index 5726b94cae081ee77a75e40f381ce01658c92d98..a28e94094dbc9771a681b0daada7e8150191639d 100644
--- a/themes/finc/scss/compiled.scss
+++ b/themes/finc/scss/compiled.scss
@@ -402,7 +402,7 @@ select {
&:hover,
&:focus {
- color: $white;
+ color: darken($btn-transparent-color, 30%);
}
}
@@ -1409,9 +1409,18 @@ footer .container {
a {
color: $badge-link-color;
- &:hover,
- &:focus {
- color: $badge-link-hover-color;
+ // make result number appear the same way as before it was linked up (#11177) - CK
+ &.badge-result-count {
+ color: $sidebar-badge-fa-color;
+ cursor: default;
+ }
+
+ // render only the exclude link element in strong hover color
+ i {
+ &:hover,
+ &:focus {
+ color: $badge-link-hover-color;
+ }
}
}
}
diff --git a/themes/finc/templates/Recommend/SideFacets.phtml b/themes/finc/templates/Recommend/SideFacets.phtml
index d2a8a333362c9f757e0fef0db547509484b66515..9c91f99151a1b180ac431419bcf35100f75e69b8 100644
--- a/themes/finc/templates/Recommend/SideFacets.phtml
+++ b/themes/finc/templates/Recommend/SideFacets.phtml
@@ -1,4 +1,4 @@
-<!-- finc: recommend - sidefacets -->
+<!-- finc:- recommend - sidefacets -->
<?
$this->headScript()->appendFile('facets.js');
@@ -219,12 +219,19 @@ JS;
<? else: ?>
<a href="<?=$addURL ?>" class="list-group-item facet<?=$thisFacet['operator'] ?><? if ($i >= $facets_before_more): ?> <?=$moreClass ?><?endif ?>">
<? endif; ?>
+
+ <? /* Fixme: Is this correct? - CK */ ?>
+ <? /* Finc-specific: make click on found items number select facet, like facet-title - CK */ ?>
<span class="badge">
- <?= $this->localizedNumber($thisFacet['count']) ?>
- <? if ($allowExclude): ?>
+ <? if ($allowExclude): ?>
+ <a href="<?= $addURL ?>" class="badge-result-count"><?= $this->localizedNumber($thisFacet['count']) ?></a>
<a href="<?=$this->currentPath().$results->getUrlQuery()->addFacet($title, $thisFacet['value'], 'NOT') ?>" title="<?=$this->transEsc('exclude_facet') ?>"><i class="fa fa-minus-square-o" aria-hidden="true"></i></a>
- <? endif; ?>
- </span>
+ <? else: ?>
+ <?= $this->localizedNumber($thisFacet['count']) ?>
+ <? endif; ?>
+ </span>
+ <? /* Fixme END - CK */ ?>
+
<? if ($allowExclude): ?>
<a href="<?= $addURL ?>">
<? endif; ?>