summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-24 11:11:12 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-24 11:11:12 +0000
commit3e866b2aa6d95008894910342d4cbedc8308ef2a (patch)
tree5818abf264c7331321c585d2c2abce5d73a6f572 /app/assets
parentf2999fe8f3709775ea2151fa3dcd7c456267edb2 (diff)
parentb41274c172b526705e130edca68cfab12d2c0e4a (diff)
downloadgitlab-ce-3e866b2aa6d95008894910342d4cbedc8308ef2a.tar.gz
Merge branch 'fix-markdown-preview-font' into 'master'
Use standard Markdown font in Markdown preview instead of fixed-width font Closes #2585 See merge request !1414
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/generic/typography.scss1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss
index 7a8a17ced99..551db31db12 100644
--- a/app/assets/stylesheets/generic/typography.scss
+++ b/app/assets/stylesheets/generic/typography.scss
@@ -110,7 +110,6 @@ textarea.js-gfm-input {
}
.md-preview {
- font-family: $monospace_font;
}
.strikethrough {