Skip to content
Snippets Groups Projects
Commit a6a72798 authored by Robert Lange's avatar Robert Lange
Browse files

refs #22306 [finc] search filter

* add var definition for padding and default value of 0
* filters: avoid notice by checking filter value not empty
parent 6b0b3d86
Branches
Tags
No related merge requests found
...@@ -845,9 +845,9 @@ $search-filter-remove-button-text-white-space: nowrap !default; ...@@ -845,9 +845,9 @@ $search-filter-remove-button-text-white-space: nowrap !default;
$search-filter-remove-icon: '\f00d' !default; $search-filter-remove-icon: '\f00d' !default;
$search-filter-remove-icon-hover-color: $red !default; $search-filter-remove-icon-hover-color: $red !default;
$search-filter-remove-icon-vertical-align: top !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-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 // Unset the vertical alignment from BS to align dropdowns AND indiv. buttons
// The relevant definition is '.searchForm .btn {vertical-align: top;}' // The relevant definition is '.searchForm .btn {vertical-align: top;}'
......
...@@ -125,6 +125,7 @@ ...@@ -125,6 +125,7 @@
// Move 'x' to the right of the buttons in dropdown // Move 'x' to the right of the buttons in dropdown
.search-filter-dropdown & { .search-filter-dropdown & {
padding: $search-filter-remove-icon-in-dropdown-padding;
position: $search-filter-remove-icon-in-dropdown-position; position: $search-filter-remove-icon-in-dropdown-position;
right: $search-filter-remove-icon-in-dropdown-distance-from-right; right: $search-filter-remove-icon-in-dropdown-distance-from-right;
} }
......
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
?> ?>
<?php // Normal view ?> <?php // Normal view ?>
<div class="active-filters hidden-xs"> <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 */ ?> <?php /* finc adds verbose reload warning via aria-label */ ?>
<a class="reset-filters-btn" href="<?=$resetLink?>" <a class="reset-filters-btn" href="<?=$resetLink?>"
aria-label="<?=$this->transEsc('clear_tag_filter') ?> &ndash; <?=$this->transEsc('page_reload_on_deselect_all_hint', ['%%filter_name%%' => $value['displayText']])?>" aria-label="<?=$this->transEsc('clear_tag_filter') ?> &ndash; <?=$this->transEsc('page_reload_on_deselect_all_hint', ['%%filter_name%%' => $value['displayText']])?>"
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<?php // Narrow view ?> <?php // Narrow view ?>
<div class="active-filters visible-xs"> <div class="active-filters visible-xs">
<div class="filters-toggle-bar"> <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 */ ?> <?php /* finc adds verbose reload warning via aria-label */ ?>
<a class="reset-filters-btn active" href="<?=$resetLink?>" <a class="reset-filters-btn active" href="<?=$resetLink?>"
aria-label="<?=$this->transEsc('clear_tag_filter') ?> &ndash; <?=$this->transEsc('page_reload_on_deselect_all_hint', ['%%filter_name%%' => $value['displayText']])?>"> aria-label="<?=$this->transEsc('clear_tag_filter') ?> &ndash; <?=$this->transEsc('page_reload_on_deselect_all_hint', ['%%filter_name%%' => $value['displayText']])?>">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment