From 390d4184409b70e05b59960b7a36cba333f654e0 Mon Sep 17 00:00:00 2001
From: Heike Reinken <reinken@ub.uni-leipzig.de>
Date: Tue, 9 Jun 2020 13:50:54 +0200
Subject: [PATCH] refs #17616 [master] Amend the Recordtabs - Context side *
Set the <h3> to <h2> * Amend contrast for hover over "jstree-clicked" item *
Amend contrast for hover over the toggle triangle * Amend the color for
clicked Context items * Remove solution suggestion
---
themes/finc/scss/_customVariables.scss | 5 +++++
themes/finc/scss/compiled.scss | 12 +++++++++++-
themes/finc/templates/RecordTab/holdingsils.phtml | 12 ++++++------
3 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss
index a7a48098ef8..934dcb13290 100644
--- a/themes/finc/scss/_customVariables.scss
+++ b/themes/finc/scss/_customVariables.scss
@@ -164,6 +164,11 @@ $tooltip-color: $snow !default;
$tooltip-bg: lighten($brand-primary, 20%) !default;
$tooltip-arrow-color: $tooltip-bg !default;
+//// Hierarchy
+$jstree-clicked-color: $steel;
+$jstree-clicked-hover-color: $black;
+$jstree-ocl-hover-before-color: $jumbo;
+
//// ELEMENT COLORS
$body-bg: $snow !default;
//// Main content are bg
diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss
index d601b8632b3..372df7e183c 100644
--- a/themes/finc/scss/compiled.scss
+++ b/themes/finc/scss/compiled.scss
@@ -1863,6 +1863,15 @@ footer {
min-width: 18px; // do not translate into em
}
+ .jstree-closed > .jstree-ocl,
+ .jstree-open > .jstree-ocl {
+
+ &:hover::before,
+ &:focus::before {
+ color: $jstree-ocl-hover-before-color;
+ }
+ }
+
li.jstree-facet,
li.jstree-node {
line-height: 1.75;
@@ -1896,13 +1905,14 @@ footer {
// Current item
.jstree-clicked {
+ color: $jstree-clicked-color;
padding-bottom: .25em;
padding-right: .5em;
padding-top: .3em;
&:hover,
&:focus {
- color: $brand-secondary;
+ color: $jstree-clicked-hover-color;
}
}
}
diff --git a/themes/finc/templates/RecordTab/holdingsils.phtml b/themes/finc/templates/RecordTab/holdingsils.phtml
index 3a14112478b..5798e8fd683 100644
--- a/themes/finc/templates/RecordTab/holdingsils.phtml
+++ b/themes/finc/templates/RecordTab/holdingsils.phtml
@@ -62,7 +62,7 @@ if (!empty($holdingTitleHold)): ?>
<?php /* finc: add 'Online Access' in holdings-tab #13770 - VE */ ?>
<?php if (!empty($urls) || $openUrlActive || $doiActive): ?>
- <h3><?=$this->transEsc("Internet")?></h3>
+ <h2><?=$this->transEsc("Internet")?></h2>
<?php if (!empty($urls)): ?>
<?php foreach ($urls as $current): ?>
<a href="<?=$this->escapeHtmlAttr($this->proxyUrl($current['url']))?>"><?=$this->escapeHtml($current['desc'])?></a><br/>
@@ -90,14 +90,14 @@ if (!empty($holdingTitleHold)): ?>
<?php /* nxt line = finc-specific - #7841@56988450 - CK */ ?>
<?php $holdingsEmpty = false; ?>
<?php /* this next line produces an empty h3 heading in some cases - should be solved more elegantly - Fixme - CK */ ?>
- <h3>
+ <h2>
<?php $locationText = $this->transEsc('location_' . $holding['location'], [], $holding['location']); ?>
<?php if (isset($holding['locationhref']) && $holding['locationhref']): ?>
<a href="<?=$holding['locationhref']?>" target="_blank"><?=$locationText?></a>
<?php else: ?>
<?=$locationText?>
<?php endif; ?>
- </h3>
+ </h2>
<?php /* nxt line = finc-specific - branch info - CK */ ?>
<?php if (isset($holding['locationid'])): ?>
@@ -166,12 +166,12 @@ if (!empty($holdingTitleHold)): ?>
<?php /* finc-specific: nxt 3 lines - #7841@56988450 - CK */ ?>
<?php if ($holdingsEmpty && $this->driver->tryMethod('getLocalOrderInformation') == 'e'): ?>
- <h3><?=$this->transEsc("title_ordered_by_library")?></h3>
+ <h2><?=$this->transEsc("title_ordered_by_library")?></h2>
<?php endif; ?>
<?php /* finc-specific - external access - #9245 - CK */ ?>
<?php if (!empty($extUrls)): ?>
- <h3><?=$this->transEsc("external_access")?></h3>
+ <h2><?=$this->transEsc("external_access")?></h2>
<?php if (!empty($extUrls)): ?>
<?php foreach ($extUrls as $current): ?>
<a href="<?=$this->escapeHtmlAttr($this->proxyUrl($current['url']))?>"><?=$this->escapeHtml($this->transEsc($current['desc']))?></a>
@@ -183,7 +183,7 @@ if (!empty($holdingTitleHold)): ?>
<?php $history = $this->driver->getRealTimeHistory(); ?>
<?php if (is_array($history) && !empty($history)): ?>
- <h3><?=$this->transEsc("Most Recent Received Issues")?></h3>
+ <h2><?=$this->transEsc("Most Recent Received Issues")?></h2>
<?php /* include responsive data table - CK */ ?>
<table class="table table-striped table-resp-data">
<?php foreach ($history as $row): ?>
--
GitLab