From a6a72798d059ae66dfafec252ed6ef28580090d9 Mon Sep 17 00:00:00 2001
From: Robert Lange <robert.lange@uni-leipzig.de>
Date: Wed, 31 Aug 2022 15:24:31 +0200
Subject: [PATCH] refs #22306 [finc] search filter
* add var definition for padding and default value of 0
* filters: avoid notice by checking filter value not empty
---
themes/finc/scss/_customVariables.scss | 4 ++--
themes/finc/scss/components/_header-active-filters.scss | 1 +
themes/finc/templates/search/filters.phtml | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss
index 07c48677a27..286b90ac5b9 100644
--- a/themes/finc/scss/_customVariables.scss
+++ b/themes/finc/scss/_customVariables.scss
@@ -845,9 +845,9 @@ $search-filter-remove-button-text-white-space: nowrap !default;
$search-filter-remove-icon: '\f00d' !default;
$search-filter-remove-icon-hover-color: $red !default;
$search-filter-remove-icon-vertical-align: top !default;
-$search-filter-remove-icon-in-dropdown-position: absolute !default;
$search-filter-remove-icon-in-dropdown-distance-from-right: 1rem !default;
-
+$search-filter-remove-icon-in-dropdown-padding: 0 !default;
+$search-filter-remove-icon-in-dropdown-position: absolute !default;
// Unset the vertical alignment from BS to align dropdowns AND indiv. buttons
// The relevant definition is '.searchForm .btn {vertical-align: top;}'
diff --git a/themes/finc/scss/components/_header-active-filters.scss b/themes/finc/scss/components/_header-active-filters.scss
index 11c7638ce98..b068618abf9 100644
--- a/themes/finc/scss/components/_header-active-filters.scss
+++ b/themes/finc/scss/components/_header-active-filters.scss
@@ -125,6 +125,7 @@
// Move 'x' to the right of the buttons in dropdown
.search-filter-dropdown & {
+ padding: $search-filter-remove-icon-in-dropdown-padding;
position: $search-filter-remove-icon-in-dropdown-position;
right: $search-filter-remove-icon-in-dropdown-distance-from-right;
}
diff --git a/themes/finc/templates/search/filters.phtml b/themes/finc/templates/search/filters.phtml
index 6d365819d79..0a5a63cce45 100644
--- a/themes/finc/templates/search/filters.phtml
+++ b/themes/finc/templates/search/filters.phtml
@@ -130,7 +130,7 @@
?>
<?php // Normal view ?>
<div class="active-filters hidden-xs">
- <?php if ($resetLink && $options->getRetainFilterSetting()): ?>
+ <?php if ($resetLink && !empty($value) && $options->getRetainFilterSetting()): ?>
<?php /* finc adds verbose reload warning via aria-label */ ?>
<a class="reset-filters-btn" href="<?=$resetLink?>"
aria-label="<?=$this->transEsc('clear_tag_filter') ?> – <?=$this->transEsc('page_reload_on_deselect_all_hint', ['%%filter_name%%' => $value['displayText']])?>"
@@ -148,7 +148,7 @@
<?php // Narrow view ?>
<div class="active-filters visible-xs">
<div class="filters-toggle-bar">
- <?php if ($resetLink && $options->getRetainFilterSetting()): ?>
+ <?php if ($resetLink && !empty($value) && $options->getRetainFilterSetting()): ?>
<?php /* finc adds verbose reload warning via aria-label */ ?>
<a class="reset-filters-btn active" href="<?=$resetLink?>"
aria-label="<?=$this->transEsc('clear_tag_filter') ?> – <?=$this->transEsc('page_reload_on_deselect_all_hint', ['%%filter_name%%' => $value['displayText']])?>">
--
GitLab