Commit 09061504 authored by Phil Hughes's avatar Phil Hughes

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
parents c0a499a3 904af016
...@@ -189,7 +189,7 @@ export default { ...@@ -189,7 +189,7 @@ export default {
<div <div
ref="gl-form" ref="gl-form"
:class="{ 'prepend-top-default append-bottom-default': addSpacingClasses }" :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 <markdown-header
:preview-markdown="previewMarkdown" :preview-markdown="previewMarkdown"
......
...@@ -50,10 +50,6 @@ ...@@ -50,10 +50,6 @@
transition: opacity 200ms ease-in-out; transition: opacity 200ms ease-in-out;
} }
.md-area {
position: relative;
}
.md-header { .md-header {
.nav-links { .nav-links {
a { a {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
= _('This merge request is locked.') = _('This merge request is locked.')
= _('Only project members can comment.') = _('Only project members can comment.')
.md-area .md-area.position-relative
.md-header .md-header
%ul.nav.nav-tabs.nav-links.clearfix %ul.nav.nav-tabs.nav-links.clearfix
%li.md-header-tab.active %li.md-header-tab.active
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment