diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-12 11:41:00 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-12 11:41:00 +0000 |
| commit | c3049883061d4083340b9ace580b283d00e48982 (patch) | |
| tree | ad3683eacc9dcca3f48901bbdebb1e11e7ed0942 /app | |
| parent | 587f850170a38e2642c0de76fb69efdeae930d66 (diff) | |
| parent | 7a22b6b0deda14bfc838d72990dab72c22826984 (diff) | |
| download | gitlab-ce-c3049883061d4083340b9ace580b283d00e48982.tar.gz | |
Merge branch 'improve_button_styles' into 'master'
Improve button styles
I noticed a couple of buttons don't match the newer styles.
## Issue edit note form
### Current (cancel button is big)
### Now
## Merge request code discussion
### Current
### Now (Also changed to `btn-save` class which changes to green. This matches everything else)
cc/ @jschatz1 @skyruler @creamzy
See merge request !2350
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/notes_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/_edit_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/notes/_form.html.haml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index 5f0c921413a..53c543c28c5 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -67,7 +67,7 @@ module NotesHelper line_type: line_type } - button_tag class: 'btn reply-btn js-discussion-reply-button', + button_tag class: 'btn btn-nr reply-btn js-discussion-reply-button', data: data, title: 'Add a reply' do link_text = icon('comment') link_text << ' Reply' 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 |