Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

99a9d97c · Dmitriy Zaporozhets · 17fd0e5c · fb74d4a9 · 99a9d97c
Commit 99a9d97c authored Mar 26, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

app/assets/stylesheets/generic/typography.scss app/assets/stylesheets/generic/typography.scss +8 -0

No files found.
--- 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;
+}