Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Stud.IP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marcus Eibrink-Lunzenauer
Stud.IP
Commits
c3805d4d
Commit
c3805d4d
authored
5 months ago
by
Jan-Hendrik Willms
Browse files
Options
Downloads
Patches
Plain Diff
fix alignment of expand items in global search, fixes #4617
Closes #4617 Merge request
studip/studip!3430
parent
0f9838ce
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
resources/assets/javascripts/lib/global_search.js
+4
-5
4 additions, 5 deletions
resources/assets/javascripts/lib/global_search.js
resources/assets/stylesheets/scss/globalsearch.scss
+2
-3
2 additions, 3 deletions
resources/assets/stylesheets/scss/globalsearch.scss
with
6 additions
and
8 deletions
resources/assets/javascripts/lib/global_search.js
+
4
−
5
View file @
c3805d4d
...
...
@@ -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="">`
)
...
...
This diff is collapsed.
Click to expand it.
resources/assets/stylesheets/scss/globalsearch.scss
+
2
−
3
View file @
c3805d4d
...
...
@@ -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
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment