diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js index d918d80df8d902299649bbb48ed73b0aafb5e88a..df20e1e9c88d1f600bf017bd4472662ff3d3ce7e 100644 --- a/app/assets/javascripts/gfm_auto_complete.js +++ b/app/assets/javascripts/gfm_auto_complete.js @@ -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 = '
  • /${name}'; + let tpl = '
  • /${name}'; if (value.aliases.length > 0) { - tpl += ' (or /<%- aliases.join(", /") %>)'; + tpl += ' (or /<%- aliases.join(", /") %>)'; } if (value.params.length > 0) { - tpl += ' <%- params.join(" ") %>'; + tpl += ' <%- params.join(" ") %>'; } if (value.description !== '') { tpl += '<%- description %>'; diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index 6b07ffdbd61c97b6268168e8fc382df95e11c622..938f5f49c092d96e07bda75bc474a646d6810ffa 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -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; } diff --git a/changelogs/unreleased/40190-fix-slash-commands-dropdown-description-mis-alignement-on-firefox.yml b/changelogs/unreleased/40190-fix-slash-commands-dropdown-description-mis-alignement-on-firefox.yml new file mode 100644 index 0000000000000000000000000000000000000000..71a606ff6074f85f4b3b68f23a3c7dfe1f0ec8d7 --- /dev/null +++ b/changelogs/unreleased/40190-fix-slash-commands-dropdown-description-mis-alignement-on-firefox.yml @@ -0,0 +1,5 @@ +--- +title: "Fix slash commands dropdown description mis-alignment on Firefox" +merge_request: 16125 +author: Maurizio De Santis +type: fixed