Merge pull request #1713 from riyad/fix-issue-close-and-reopen-buttons

Fix issue close and reopen button text and styles

app/assets/stylesheets/sections/issues.scss

@@ -65,6 +65,23 @@ input.check_all_issues {
   }
 }
 
+.btn.close_issue {
+  color: #B94A48;
+  font-weight: bold;
+  @include shade;
+  &:hover {
+    color: #B94A48;
+  }
+}
+.btn.reopen_issue {
+  color: #468847;
+  font-weight: bold;
+  @include shade;
+  &:hover {
+    color: #468847;
+  }
+}
+
 @media (min-width: 800px) { .issues_filters select { width:160px; }  }
 @media (min-width: 1000px) { .issues_filters select { width:200px; }  }
 @media (min-width: 1200px) { .issues_filters select { width:220px; }  }

app/views/issues/_show.html.haml

@@ -15,7 +15,7 @@
       - if issue.closed
         = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {closed: false }, status_only: true), method: :put,  class: "btn small grouped reopen_issue", remote: true
       - else
-        = link_to 'Resolve', project_issue_path(issue.project, issue, issue: {closed: true }, status_only: true), method: :put, class: "success btn small grouped close_issue", remote: true
+        = link_to 'Close', project_issue_path(issue.project, issue, issue: {closed: true }, status_only: true), method: :put, class: "btn small grouped close_issue", remote: true
       = link_to edit_project_issue_path(issue.project, issue), class: "btn small edit-issue-link", remote: true do
         %i.icon-edit
         Edit

app/views/issues/show.html.haml

@@ -8,9 +8,9 @@
   %span.right
     - if can?(current_user, :admin_project, @project) || @issue.author == current_user
       - if @issue.closed
-        = link_to 'Reopen', project_issue_path(@project, @issue, issue: {closed: false }, status_only: true), method: :put,  class: "btn grouped success"
+        = link_to 'Reopen', project_issue_path(@project, @issue, issue: {closed: false }, status_only: true), method: :put,  class: "btn grouped reopen_issue"
       - else
-        = link_to 'Close', project_issue_path(@project, @issue, issue: {closed: true }, status_only: true), method: :put, class: "btn grouped danger", title: "Close Issue"
+        = link_to 'Close', project_issue_path(@project, @issue, issue: {closed: true }, status_only: true), method: :put, class: "btn grouped close_issue", title: "Close Issue"
     - if can?(current_user, :admin_project, @project) || @issue.author == current_user
       = link_to edit_project_issue_path(@project, @issue), class: "btn grouped" do
         %i.icon-edit