summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-14 16:19:16 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-14 16:19:16 +0100
commitfc9a2a3e70488d8b658f007756bc1299dd57991b (patch)
treee65ca59fd3f2fc1f8ed15515db4ae87e5d53200e /app/assets/stylesheets/pages
parent33ccee239ebcac7785c1ad466c1624a43af99c90 (diff)
parent5987e88306b50d187a76cca60b5df92e72475f47 (diff)
downloadgitlab-ce-fc9a2a3e70488d8b658f007756bc1299dd57991b.tar.gz
Merge remote-tracking branch 'origin/rs-autosize'
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r--app/assets/stylesheets/pages/note_form.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index d86259f93fb..2c9a42f9892 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -159,6 +159,7 @@
.edit_note {
.markdown-area {
min-height: 140px;
+ max-height: 430px;
}
.note-form-actions {
background: transparent;