diff options
| author | Andriy Dyadyura <adyadyura@Andriys-MBP.lan> | 2015-12-22 21:37:11 +0100 |
|---|---|---|
| committer | Andriy Dyadyura <adyadyura@Andriys-MBP.lan> | 2015-12-22 21:37:11 +0100 |
| commit | f4dabf97958fc6787bec28a28726e10a5c179cb9 (patch) | |
| tree | 652df7cef1c4e0e9dfc76306aebeb8251621a523 | |
| parent | a72b71abccfbd354b709871f252d8e02f1cf233d (diff) | |
| download | gitlab-ce-f4dabf97958fc6787bec28a28726e10a5c179cb9.tar.gz | |
new buttons issue
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/issues/_discussion.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/notes/_form.html.haml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 4cf1a28c459..18cfcc05e7b 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -75,7 +75,7 @@ .common-note-form { margin: 0; - background: #F7F8FA; + background: #fff; padding: $gl-padding; margin-left: -$gl-padding; margin-right: -$gl-padding; @@ -84,7 +84,7 @@ } .note-form-actions { - background: #F9F9F9; + background: #fff; .note-form-option { margin-top: 8px; diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index 86d3dc546ba..82322ba1549 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -1,9 +1,9 @@ - content_for :note_actions do - if can?(current_user, :update_issue, @issue) - if @issue.closed? - = link_to 'Reopen Issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true), method: :put, class: 'btn btn-grouped btn-reopen js-note-target-reopen', title: 'Reopen Issue' + = link_to 'Reopen Issue', issue_path(@issue, issue: {state_event: :reopen}, status_only: true), method: :put, class: 'btn btn-grouped btn-nr btn-success js-note-target-reopen', title: 'Reopen Issue' - else - = link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close}, status_only: true), method: :put, class: 'btn btn-grouped btn-close js-note-target-close', title: 'Close Issue' + = link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close}, status_only: true), method: :put, class: 'btn btn-grouped btn-nr btn-warning js-note-target-close', title: 'Close Issue' #notes = render 'projects/notes/notes_with_form' diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index 88e711ab534..df4f5ebb0f8 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -13,6 +13,6 @@ .error-alert .note-form-actions.clearfix - = f.submit 'Add Comment', class: "btn btn-create comment-btn btn-grouped js-comment-button" + = f.submit 'Add Comment', class: "btn btn-nr btn-success comment-btn btn-grouped js-comment-button" = yield(:note_actions) %a.btn.btn-cancel.js-close-discussion-note-form Cancel |