summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-26 10:37:33 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-26 10:37:33 +0200
commit99a9d97c44a23aae4e712de45180ed362369ab11 (patch)
tree0fa9f4e7e3a2d393c66c0edbc8532d9d2b72129b
parent17fd0e5c724b2001549a049d7db2179cfd1b9a14 (diff)
parentfb74d4a9489ebfa55d638cd34005338c3fc4f965 (diff)
downloadgitlab-ce-99a9d97c44a23aae4e712de45180ed362369ab11.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
-rw-r--r--app/assets/stylesheets/generic/typography.scss8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss
index 3a31e28e0ac..bca0b12ab62 100644
--- a/app/assets/stylesheets/generic/typography.scss
+++ b/app/assets/stylesheets/generic/typography.scss
@@ -120,3 +120,11 @@ a:focus {
.md {
@include md-typography;
}
+
+/**
+ * Textareas intended for GFM
+ *
+ */
+textarea.js-gfm-input {
+ font-family: $monospace_font;
+}