From 617a22f2cccef67edae3e9093a0f94dbb31f2a9f Mon Sep 17 00:00:00 2001
From: Robert Lange <robert.lange@uni-leipzig.de>
Date: Wed, 25 Sep 2019 11:55:19 +0200
Subject: [PATCH] refs #16082 [fid_adlr] handle new font for iconmoon * use
chevron-down instead of caret-down * use new code for search icon at
find-button
---
themes/fid_adlr/scss/_customMixins.scss | 3 ++-
themes/fid_adlr/scss/compiled.scss | 2 +-
themes/fid_adlr/templates/header.phtml | 8 +++++---
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/themes/fid_adlr/scss/_customMixins.scss b/themes/fid_adlr/scss/_customMixins.scss
index c39adba146f..7cf2c1521ce 100644
--- a/themes/fid_adlr/scss/_customMixins.scss
+++ b/themes/fid_adlr/scss/_customMixins.scss
@@ -269,12 +269,13 @@
min-width: $search-button-clip-width-sm;
width: $search-button-clip-width-sm;
&:before {
+ color: $black;
+ content: '\e936';
font-family: 'icomoon', sans-serif;
font-size: $font-size-menu-default;
font-weight: bold;
line-height: 1;
text-transform: none;
- content: '\e927';
}
}
diff --git a/themes/fid_adlr/scss/compiled.scss b/themes/fid_adlr/scss/compiled.scss
index eaa11eaf612..ca2c0a49be2 100644
--- a/themes/fid_adlr/scss/compiled.scss
+++ b/themes/fid_adlr/scss/compiled.scss
@@ -546,7 +546,7 @@ header.collapse.in .menubar .text-close, .dropdown.sbox-dd:not(.open) .text-clos
display: none;
}
-header.collapse:not(.in) .menubar .text-open, header.collapsing .text-open, .dropdown.sbox-dd.open .text-open, .language.open .icon.icon-caret-down {
+header.collapse:not(.in) .menubar .text-open, header.collapsing .text-open, .dropdown.sbox-dd.open .text-open, .language.open .icon.icon-chevron-down {
display: none;
}
diff --git a/themes/fid_adlr/templates/header.phtml b/themes/fid_adlr/templates/header.phtml
index 49547d9c944..1a27247a1db 100644
--- a/themes/fid_adlr/templates/header.phtml
+++ b/themes/fid_adlr/templates/header.phtml
@@ -50,7 +50,7 @@
<form method="post" name="themeForm" id="themeForm">
<input type="hidden" name="ui"/>
</form>
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?=$this->transEsc("Theme")?> <b class="icon icon-caret-down"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?=$this->transEsc("Theme")?> <b class="icon icon-chevron-down"></b></a>
<ul class="dropdown-menu">
<?php foreach ($this->layout()->themeOptions as $current): ?>
<li<?=$current['selected'] ? ' class="active"' : ''?>>
@@ -122,7 +122,9 @@
data-toggle="dropdown"
aria-controls="langmenu" aria-expanded="false">
<span class="sr-only">Toggle language</span>
- <?= $this->layout()->userLang ?> <i class="icon icon-caret-down" aria-hidden="true"></i><i class="icon icon-chevron-up" aria-hidden="true"></i>
+ <?= $this->layout()->userLang ?>
+ <i class="icon icon-chevron-down" aria-hidden="true"></i>
+ <i class="icon icon-chevron-up" aria-hidden="true"></i>
</a>
<ul id="langmenu" class="dropdown-menu" aria-labelledby="quickfilter-language">
<?php foreach ($this->layout()->allLangs as $langCode => $langName): ?>
@@ -188,7 +190,7 @@
<div class="dropdown sbox-dd">
<?php /* no data-toggle: .open dropdown-menu of sbox manually to prevent interdependence-bug with dropdown quickfilter(s) within sbox - RL */ ?>
<button class="btn btn-primary dropdown-toggle" type="button" id="search-main-dropdown">
- <span class="text-open"><?= $this->transEsc("Open Search") ?><span class="icon icon-caret-down"></span></span>
+ <span class="text-open"><?= $this->transEsc("Open Search") ?><span class="icon icon-chevron-down"></span></span>
<span class="text-close"><?= $this->transEsc("Close Search") ?><span
class="icon icon-chevron-up"></span></span>
</button>
--
GitLab