diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-17 22:22:58 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-17 22:22:58 +0000 |
| commit | 94246c7aa01bd825953e6676f79aa9db51209822 (patch) | |
| tree | db77152d87492d7a1315fe2ae001b55c1d36a288 | |
| parent | 5d71d9fb9d6ca89710549fbfef62d105d9544a30 (diff) | |
| parent | 4ecb03801323b62b6ba824b17919eb392c475845 (diff) | |
| download | gitlab-ce-94246c7aa01bd825953e6676f79aa9db51209822.tar.gz | |
Merge branch '26236-monospace-gfm' into 'master'
26236 Change gfm textarea to use monospace font
Closes #26236
See merge request !10021
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/26236-monospace-gfm.yml | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index db5e2c51fe7..c241816788b 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -306,6 +306,11 @@ a > code { * Textareas intended for GFM * */ +textarea.js-gfm-input { + font-family: $monospace_font; + font-size: 13px; +} + .strikethrough { text-decoration: line-through; } diff --git a/changelogs/unreleased/26236-monospace-gfm.yml b/changelogs/unreleased/26236-monospace-gfm.yml new file mode 100644 index 00000000000..c44f3d4d3dc --- /dev/null +++ b/changelogs/unreleased/26236-monospace-gfm.yml @@ -0,0 +1,4 @@ +--- +title: Change gfm textarea to use monospace font +merge_request: +author: |