Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
f07727d9
Commit
f07727d9
authored
Jan 08, 2018
by
Maurizio De Santis
Committed by
Phil Hughes
Jan 08, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix slash commands dropdown description
parent
82e2d90b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
app/assets/javascripts/gfm_auto_complete.js
app/assets/javascripts/gfm_auto_complete.js
+3
-3
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+12
-0
changelogs/unreleased/40190-fix-slash-commands-dropdown-description-mis-alignement-on-firefox.yml
...mmands-dropdown-description-mis-alignement-on-firefox.yml
+5
-0
No files found.
app/assets/javascripts/gfm_auto_complete.js
View file @
f07727d9
...
...
@@ -57,12 +57,12 @@ class GfmAutoComplete {
displayTpl
(
value
)
{
if
(
GfmAutoComplete
.
isLoading
(
value
))
return
GfmAutoComplete
.
Loading
.
template
;
// eslint-disable-next-line no-template-curly-in-string
let
tpl
=
'
<li>
/${name}
'
;
let
tpl
=
'
<li>
<span class="name">/${name}</span>
'
;
if
(
value
.
aliases
.
length
>
0
)
{
tpl
+=
'
<small>(or /<%- aliases.join(", /") %>)</small>
'
;
tpl
+=
'
<small
class="aliases"
>(or /<%- aliases.join(", /") %>)</small>
'
;
}
if
(
value
.
params
.
length
>
0
)
{
tpl
+=
'
<small><%- params.join(" ") %></small>
'
;
tpl
+=
'
<small
class="params"
><%- params.join(" ") %></small>
'
;
}
if
(
value
.
description
!==
''
)
{
tpl
+=
'
<small class="description"><i><%- description %></i></small>
'
;
...
...
app/assets/stylesheets/framework/markdown_area.scss
View file @
f07727d9
...
...
@@ -192,6 +192,17 @@
overflow-y
:
auto
;
overflow-x
:
hidden
;
.name
,
small
.aliases
,
small
.params
{
float
:
left
;
}
small
.aliases
,
small
.params
{
padding
:
2px
5px
;
}
small
.description
{
float
:
right
;
padding
:
3px
5px
;
...
...
@@ -209,6 +220,7 @@
}
ul
>
li
{
@include
clearfix
;
white-space
:
nowrap
;
}
...
...
changelogs/unreleased/40190-fix-slash-commands-dropdown-description-mis-alignement-on-firefox.yml
0 → 100644
View file @
f07727d9
---
title
:
"
Fix
slash
commands
dropdown
description
mis-alignment
on
Firefox"
merge_request
:
16125
author
:
Maurizio De Santis
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment