diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-01-18 19:35:06 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-01-18 19:35:06 +0000 |
| commit | 49efb57914b7daac651e0b3fbeb850584be66ce7 (patch) | |
| tree | 5f4dc736255bdcfc30e982dba3f885aebfd07403 | |
| parent | c5bc18da54dc60abe6f9e16a144be5ec99b38996 (diff) | |
| parent | 0cd37ad9d95a2d7026b2e1e67dacbfc8a3dafcd0 (diff) | |
| download | gitlab-ce-49efb57914b7daac651e0b3fbeb850584be66ce7.tar.gz | |
Merge branch '56389-remove-unwanted-suggestion-flash-margin' into 'master'
Remove unwanted margin above suggested changes.
Closes #56389
See merge request gitlab-org/gitlab-ce!24419
3 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue index 721f0276ac8..dcda701f049 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue @@ -129,7 +129,7 @@ export default { <template> <div> - <div class="flash-container mt-3"></div> + <div class="flash-container js-suggestions-flash"></div> <div v-show="isRendered" ref="container" v-html="noteHtml"></div> </div> </template> diff --git a/changelogs/unreleased/56389-remove-unwanted-suggestion-flash-margin.yml b/changelogs/unreleased/56389-remove-unwanted-suggestion-flash-margin.yml new file mode 100644 index 00000000000..3494feb9be1 --- /dev/null +++ b/changelogs/unreleased/56389-remove-unwanted-suggestion-flash-margin.yml @@ -0,0 +1,5 @@ +--- +title: Remove unwanted margin above suggested changes. +merge_request: 24419 +author: +type: fixed diff --git a/spec/javascripts/vue_shared/components/markdown/suggestions_spec.js b/spec/javascripts/vue_shared/components/markdown/suggestions_spec.js index 423cd6dee0f..33be63a3a1e 100644 --- a/spec/javascripts/vue_shared/components/markdown/suggestions_spec.js +++ b/spec/javascripts/vue_shared/components/markdown/suggestions_spec.js @@ -61,7 +61,7 @@ describe('Suggestion component', () => { describe('mounted', () => { it('renders a flash container', () => { - expect(vm.$el.querySelector('.flash-container')).not.toBeNull(); + expect(vm.$el.querySelector('.js-suggestions-flash')).not.toBeNull(); }); it('renders a container for suggestions', () => { |