diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-20 15:54:49 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-20 15:54:49 +0000 |
| commit | a4422a3a2efa983a2a7a21a806eb4e4c957e7be0 (patch) | |
| tree | 55478428138be028da27ba241d295a6cf7e8b2e7 /app/views/projects | |
| parent | d3e9134601900e6e11dea5bd1fbabce57ef76fe3 (diff) | |
| parent | 7dde8b2cf050ca6162f75799e2966015a476b38c (diff) | |
| download | gitlab-ce-a4422a3a2efa983a2a7a21a806eb4e4c957e7be0.tar.gz | |
Merge branch 'edit-form-alignment' into 'master'
Fix spacing below edit note form
Also changed to allow the CSS to decide what should be hidden when editing
Thanks @JobV for having eagle eyes :stuck_out_tongue_winking_eye:
See merge request !3306
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/notes/_edit_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/notes/_edit_form.html.haml b/app/views/projects/notes/_edit_form.html.haml index 13e624764d9..2999befffc6 100644 --- a/app/views/projects/notes/_edit_form.html.haml +++ b/app/views/projects/notes/_edit_form.html.haml @@ -5,6 +5,6 @@ = render 'projects/zen', f: f, attr: :note, classes: 'note_text js-note-text js-task-list-field' = render 'projects/notes/hints' - .note-form-actions + .note-form-actions.clearfix = f.submit 'Save Comment', class: 'btn btn-nr btn-save btn-grouped js-comment-button' = link_to 'Cancel', '#', class: 'btn btn-nr btn-cancel note-edit-cancel' |