diff options
| author | Phil Hughes <me@iamphill.com> | 2019-04-01 13:27:11 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-04-01 13:27:11 +0000 |
| commit | 09061504c959f8eaef3a11617274c07489b84ab2 (patch) | |
| tree | b870ec1a6b5384080c6f190189556d7d6645f8b0 /app | |
| parent | c0a499a3f4a4c51f1d26059dc961bb5581ba93e2 (diff) | |
| parent | 904af0164ebf93e166289771eca1701d2949f46f (diff) | |
| download | gitlab-ce-09061504c959f8eaef3a11617274c07489b84ab2.tar.gz | |
Merge branch '59694-markdown-area' into 'master'
Fix styleling for `app/assets/stylesheets/framework/markdown_area.scss`
See merge request gitlab-org/gitlab-ce!26768
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/field.vue | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/_md_preview.html.haml | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue index a4b3131c8e4..eccf73e227c 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/field.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue @@ -189,7 +189,7 @@ export default { <div ref="gl-form" :class="{ 'prepend-top-default append-bottom-default': addSpacingClasses }" - class="md-area js-vue-markdown-field" + class="js-vue-markdown-field md-area position-relative" > <markdown-header :preview-markdown="previewMarkdown" diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index b2cc3e2428a..7c10de828cd 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -50,10 +50,6 @@ transition: opacity 200ms ease-in-out; } -.md-area { - position: relative; -} - .md-header { .nav-links { a { diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml index e1a9ec0217e..10575aa68b1 100644 --- a/app/views/projects/_md_preview.html.haml +++ b/app/views/projects/_md_preview.html.haml @@ -7,7 +7,7 @@ = _('This merge request is locked.') = _('Only project members can comment.') -.md-area +.md-area.position-relative .md-header %ul.nav.nav-tabs.nav-links.clearfix %li.md-header-tab.active |