diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-24 11:11:12 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-24 11:11:12 +0000 |
| commit | 3e866b2aa6d95008894910342d4cbedc8308ef2a (patch) | |
| tree | 5818abf264c7331321c585d2c2abce5d73a6f572 | |
| parent | f2999fe8f3709775ea2151fa3dcd7c456267edb2 (diff) | |
| parent | b41274c172b526705e130edca68cfab12d2c0e4a (diff) | |
| download | gitlab-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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/generic/typography.scss | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4a34a3835a7..9c9554eb00f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,7 @@ v 8.0.2 (unreleased) - Make commit graphs responsive to window width changes (Stan Hu) - Fix top margin for sign-in button on public pages - Fix LDAP attribute mapping + - Use standard Markdown font in Markdown preview instead of fixed-width font (Stan Hu) v 8.0.1 - Remove git refs used internally by GitLab from network graph (Stan Hu) 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 { |