summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-12-20 12:29:44 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-12-20 12:31:17 -0700
commitd40f393d2c99e4a36d097471acf9379f12c34f19 (patch)
tree1bea37e8f5e7320b90867af37ad94dd928fb1ef9 /app/assets
parent9addd98035fb76636c28782abb1dd81e09c456c6 (diff)
downloadgitlab-ce-d40f393d2c99e4a36d097471acf9379f12c34f19.tar.gz
Add spec for previewing a note40063-markdown-editor-improvements
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/vue_shared/components/markdown/header.vue3
-rw-r--r--app/assets/stylesheets/framework/markdown_area.scss1
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue
index 55aaab77b7a..36d2d1dc164 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/header.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue
@@ -72,7 +72,8 @@
Preview
</a>
</li>
- <li class="md-header-toolbar"
+ <li
+ class="md-header-toolbar"
:class="{ active: !previewMarkdown }">
<toolbar-button
tag="**"
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index 7e803dfa8eb..6b07ffdbd61 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -102,7 +102,6 @@
}
}
-
.referenced-users {
color: $gl-text-color;
padding-top: 10px;