diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 15:09:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 15:09:12 +0300 |
| commit | 0e0df204c1a0d859ccbbe1be83a5e09a53381f17 (patch) | |
| tree | e7bf6fed5fa2b74caf31957c468b0cbc303f4c45 /app/assets/javascripts/vue_shared/components/markdown | |
| parent | a2344dbf1942dc3919c55b0684d2566368e03852 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/markdown')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/field.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue index 3c4070105d1..518b28afd9b 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/field.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue @@ -350,8 +350,7 @@ export default { <template> <div ref="gl-form" - :class="{ 'gl-mt-3 gl-mb-3': addSpacingClasses }" - class="js-vue-markdown-field md-area position-relative gfm-form" + class="js-vue-markdown-field md-area position-relative gfm-form gl-border-none! gl-shadow-none!" :data-uploads-path="uploadsPath" > <markdown-header diff --git a/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue b/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue index 06d1779b180..af78cc7b5ca 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue @@ -218,7 +218,7 @@ export default { }; </script> <template> - <div> + <div class="md-area gl-px-0! gl-overflow-hidden"> <local-storage-sync :value="editingMode" as-string |