summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-09-21 07:30:19 -0700
committerStan Hu <stanhu@gmail.com>2015-09-21 10:11:58 -0700
commitef2fb20135242f9ee453fae18b1e7d11b6774406 (patch)
treedfa6e4d2ca3c5ceb1cb909aaa0d56a22c6cccc8a /app/assets
parentabaa65efc1f912ffef05ccaf1e92dc009f828278 (diff)
downloadgitlab-ce-ef2fb20135242f9ee453fae18b1e7d11b6774406.tar.gz
More tweaks to make note edit/preview CSS consistent
Closes #2585
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/generic/typography.scss4
-rw-r--r--app/assets/stylesheets/pages/note_form.scss2
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss
index 41189432bf6..d5f0d86a307 100644
--- a/app/assets/stylesheets/generic/typography.scss
+++ b/app/assets/stylesheets/generic/typography.scss
@@ -105,6 +105,10 @@ textarea.js-gfm-input {
font-family: $monospace_font;
}
+.md-preview {
+ font-family: $monospace_font;
+}
+
.strikethrough {
text-decoration: line-through;
}
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index b311d26d675..fdc2c3332df 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -109,7 +109,7 @@
.note-edit-form {
display: none;
- font-size: 13px;
+ font-size: 15px;
.form-actions {
padding-left: 20px;