diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-11-29 17:41:02 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-13 14:51:07 -0500 |
| commit | 552c179acdeb73bd7a12c9e8839c06bb601cf136 (patch) | |
| tree | fea2fb694ae6f80e3e04ca1618de22ca6ff6b28e /app | |
| parent | 0e344aa2299d2f6911282de5d4808c70d658d372 (diff) | |
| download | gitlab-ce-552c179acdeb73bd7a12c9e8839c06bb601cf136.tar.gz | |
Autosize textareas
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/behaviors/autosize.js.coffee | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 1 | ||||
| -rw-r--r-- | app/views/projects/_zen.html.haml | 2 |
5 files changed, 8 insertions, 1 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 8ba00ecbbab..2d177d39104 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -246,6 +246,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 4a00a197d9a..bac47a349c1 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -107,6 +107,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; diff --git a/app/views/projects/_zen.html.haml b/app/views/projects/_zen.html.haml index d5829568275..e701253d7de 100644 --- a/app/views/projects/_zen.html.haml +++ b/app/views/projects/_zen.html.haml @@ -1,6 +1,6 @@ .zennable .zen-backdrop - - classes << ' js-gfm-input markdown-area' + - classes << ' js-gfm-input js-autosize markdown-area' - if defined?(f) && f = f.text_area attr, class: classes - else |