diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-01-13 19:46:38 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-01-13 19:46:38 +0100 |
| commit | 33ea09bdf9c05c60438f03ac1fe94b52615cd05e (patch) | |
| tree | 93e4f76b5f03f6c5d24c0ee5aef849acc9bfa253 /app/views/projects/notes | |
| parent | 0c10aee59677e2dadfef6538a74fe1e28fcdd37e (diff) | |
| parent | 1202355703b9357e85fffa308a25c86576f7bfa0 (diff) | |
| download | gitlab-ce-33ea09bdf9c05c60438f03ac1fe94b52615cd05e.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/private-references
Diffstat (limited to 'app/views/projects/notes')
| -rw-r--r-- | app/views/projects/notes/_edit_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/notes/_form.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/notes/_edit_form.html.haml b/app/views/projects/notes/_edit_form.html.haml index 3ccda1b381c..5d78652befa 100644 --- a/app/views/projects/notes/_edit_form.html.haml +++ b/app/views/projects/notes/_edit_form.html.haml @@ -6,5 +6,5 @@ = render 'projects/notes/hints' .note-form-actions - = f.submit 'Save Comment', class: 'btn btn-primary btn-save btn-grouped js-comment-button' - = link_to 'Cancel', '#', class: 'btn btn-cancel note-edit-cancel' + = 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' diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index acb6dc52a8e..f10a4145d62 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -15,4 +15,4 @@ .note-form-actions.clearfix = f.submit 'Add Comment', class: "btn btn-nr btn-create comment-btn btn-grouped js-comment-button" = yield(:note_actions) - %a.btn.btn-cancel.js-close-discussion-note-form Cancel + %a.btn.btn-nr.btn-cancel.js-close-discussion-note-form Cancel |