From 364121ec2f6a18ec1b01c469a78ec728b469a2c7 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Fri, 28 Oct 2022 10:42:30 +0000
Subject: [PATCH] =?UTF-8?q?Resolve=20"Sidebar-Suchwidget=20verwendet=20ein?=
=?UTF-8?q?en=20Link=20f=C3=BCr=20das=20Zur=C3=BCcksetzen-Icon=20statt=20e?=
=?UTF-8?q?ines=20Buttons"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes #1719
Merge request studip/studip!1122
---
resources/assets/stylesheets/scss/sidebar.scss | 3 ++-
.../vue/components/courseware/CoursewareSearchWidget.vue | 6 +++---
templates/sidebar/search-widget.php | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/resources/assets/stylesheets/scss/sidebar.scss b/resources/assets/stylesheets/scss/sidebar.scss
index 5177034c58b..51bb9c2be4d 100644
--- a/resources/assets/stylesheets/scss/sidebar.scss
+++ b/resources/assets/stylesheets/scss/sidebar.scss
@@ -324,7 +324,7 @@ select.sidebar-selectlist {
width: 100%;
}
- button {
+ .submit-search {
background-color: $content-color-20;
border: 1px solid $base-color-60;
border-left-color: $light-gray-color-40;
@@ -336,6 +336,7 @@ select.sidebar-selectlist {
}
.reset-search {
+ background-color: transparent;
border: 1px solid $base-color-60;
border-left: 0;
border-right: 0;
diff --git a/resources/vue/components/courseware/CoursewareSearchWidget.vue b/resources/vue/components/courseware/CoursewareSearchWidget.vue
index 5a2469bce0a..95f71f4d5f6 100644
--- a/resources/vue/components/courseware/CoursewareSearchWidget.vue
+++ b/resources/vue/components/courseware/CoursewareSearchWidget.vue
@@ -8,10 +8,10 @@
v-model="searchTerm"
:aria-label="$gettext('Geben Sie einen Suchbegriff mit mindestens 3 Zeichen ein.')"
/>
- <a v-if="searched" @click.prevent="setShowSearchResults(false)"
- class="reset-search">
+ <button v-if="searched" @click.prevent="setShowSearchResults(false)"
+ class="reset-search" :title="$gettext('Suche zurücksetzen')">
<studip-icon shape="decline" size="20"></studip-icon>
- </a>
+ </button>
<button
type="submit"
:value="$gettext('Suchen')"
diff --git a/templates/sidebar/search-widget.php b/templates/sidebar/search-widget.php
index df4a1dd1a07..13d6bed0ac6 100644
--- a/templates/sidebar/search-widget.php
+++ b/templates/sidebar/search-widget.php
@@ -19,7 +19,7 @@
<?= arrayToHtmlAttributes($needle['attributes']) ?>>
<? endif; ?>
<? if ($reset_link): ?>
- <a class="reset-search" href="<?= $reset_link ?>" tabindex="0"
+ <a class="reset-search" href="<?= $reset_link ?>" tabindex="0" role="button"
title="<?= _('Suche zurücksetzen') ?>">
<?= Icon::create('decline')->asImg(20) ?>
</a>
--
GitLab