From c3805d4d4c587e5faf860409e9b1a4dccea4a4a1 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 19 Sep 2024 17:20:58 +0000
Subject: [PATCH] fix alignment of expand items in global search, fixes #4617
Closes #4617
Merge request studip/studip!3430
---
resources/assets/javascripts/lib/global_search.js | 9 ++++-----
resources/assets/stylesheets/scss/globalsearch.scss | 5 ++---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/resources/assets/javascripts/lib/global_search.js b/resources/assets/javascripts/lib/global_search.js
index 394b7e30a33..19154a1b0e8 100644
--- a/resources/assets/javascripts/lib/global_search.js
+++ b/resources/assets/javascripts/lib/global_search.js
@@ -96,6 +96,10 @@ const GlobalSearch = {
// Process results and create corresponding entries.
$.each(value.content, function(index, result) {
+ // Which result types should be opened via dialog?
+ const openInDialog = ['GlobalSearchFiles', 'GlobalSearchMessages'];
+ var dataDialog = (openInDialog.indexOf(name) >= 0 ? dataDialog = 'data-dialog' : dataDialog = '');
+
// Create single result entry.
var single = $(`<a href="${result.url}" role="listitem" ${dataDialog}>`),
data = $('<div class="globalsearch-result-data">'),
@@ -105,11 +109,6 @@ const GlobalSearch = {
single.addClass('globalsearch-extended-result');
}
- // Which result types should be opened via dialog?
- const openInDialog = ['GlobalSearchFiles', 'GlobalSearchMessages'];
- var dataDialog = (openInDialog.indexOf(name) >= 0 ? dataDialog = 'data-dialog' : dataDialog = '');
- //var link = $(`<a href="${result.url}" ${dataDialog}>`).appendTo(single);
-
// Optional image...
if (result.img !== null) {
$(`<img src="${result.img}" alt="">`)
diff --git a/resources/assets/stylesheets/scss/globalsearch.scss b/resources/assets/stylesheets/scss/globalsearch.scss
index ef7c6e652f8..cca121cd8d9 100644
--- a/resources/assets/stylesheets/scss/globalsearch.scss
+++ b/resources/assets/stylesheets/scss/globalsearch.scss
@@ -175,6 +175,7 @@
display: flex;
flex-direction: row;
flex-wrap: nowrap;
+ gap: 6px;
padding: 6px 6px 6px 0;
@@ -200,7 +201,6 @@
.globalsearch-result-img {
flex: 0;
margin-left: 6px;
- margin-right: 6px;
img {
@include square(36px);
@@ -210,7 +210,6 @@
.globalsearch-result-data {
flex: 1;
overflow: hidden;
- margin-right: 6px;
white-space: nowrap;
.globalsearch-result-title {
@@ -235,7 +234,7 @@
}
.globalsearch-result-expand {
- flex: auto;
+ flex: 0;
margin: 20px 0 0 -32px;
a {
--
GitLab