diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-14 16:19:16 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-14 16:19:16 +0100 |
| commit | fc9a2a3e70488d8b658f007756bc1299dd57991b (patch) | |
| tree | e65ca59fd3f2fc1f8ed15515db4ae87e5d53200e /app/assets | |
| parent | 33ccee239ebcac7785c1ad466c1624a43af99c90 (diff) | |
| parent | 5987e88306b50d187a76cca60b5df92e72475f47 (diff) | |
| download | gitlab-ce-fc9a2a3e70488d8b658f007756bc1299dd57991b.tar.gz | |
Merge remote-tracking branch 'origin/rs-autosize'
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/behaviors/autosize.js.coffee | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/javascripts/behaviors/autosize.js.coffee b/app/assets/javascripts/behaviors/autosize.js.coffee new file mode 100644 index 00000000000..b32072e61ee --- /dev/null +++ b/app/assets/javascripts/behaviors/autosize.js.coffee @@ -0,0 +1,4 @@ +#= require autosize + +$ -> + autosize($('.js-autosize')) diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index fcf50dd1b51..356fb6aa08c 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -1,4 +1,5 @@ #= require autosave +#= require autosize #= require dropzone #= require dropzone_input #= require gfm_auto_complete @@ -246,6 +247,7 @@ class @Notes else previewButton.removeClass("turn-on").addClass "turn-off" + autosize(textarea) new Autosave textarea, [ "Note" form.find("#note_commit_id").val() diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index c540e527bed..6732343802a 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -83,6 +83,7 @@ background: #FFF; border: 1px solid #ddd; min-height: 140px; + max-height: 430px; padding: 5px; box-shadow: none; width: 100%; 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; |