Download as
Browse Code »

Commit fa4c38f32b3ac8aba6411e29ff01dfe8f336981d

Authored by Riyad Preukschas
1 parent 2a750bf2
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix issues close and reopen button text and styles

Showing 3 changed files with 20 additions and 3 deletions   Show diff stats
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @fa4c38f
@@ -65,6 +65,23 @@ input.check_all_issues { @@ -65,6 +65,23 @@ input.check_all_issues {
65 } 65 }
66 } 66 }
67 67
  68 +.btn.close_issue {
  69 + color: #B94A48;
  70 + font-weight: bold;
  71 + @include shade;
  72 + &:hover {
  73 + color: #B94A48;
  74 + }
  75 +}
  76 +.btn.reopen_issue {
  77 + color: #468847;
  78 + font-weight: bold;
  79 + @include shade;
  80 + &:hover {
  81 + color: #468847;
  82 + }
  83 +}
  84 +
68 @media (min-width: 800px) { .issues_filters select { width:160px; } } 85 @media (min-width: 800px) { .issues_filters select { width:160px; } }
69 @media (min-width: 1000px) { .issues_filters select { width:200px; } } 86 @media (min-width: 1000px) { .issues_filters select { width:200px; } }
70 @media (min-width: 1200px) { .issues_filters select { width:220px; } } 87 @media (min-width: 1200px) { .issues_filters select { width:220px; } }
app/views/issues/_show.html.haml
  Diff comments   View file @fa4c38f
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 - if issue.closed 15 - if issue.closed
16 = 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 16 = 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
17 - else 17 - else
18 - = 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 18 + = 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
19 = link_to edit_project_issue_path(issue.project, issue), class: "btn small edit-issue-link", remote: true do 19 = link_to edit_project_issue_path(issue.project, issue), class: "btn small edit-issue-link", remote: true do
20 %i.icon-edit 20 %i.icon-edit
21 Edit 21 Edit
app/views/issues/show.html.haml
  Diff comments   View file @fa4c38f
@@ -8,9 +8,9 @@ @@ -8,9 +8,9 @@
8 %span.right 8 %span.right
9 - if can?(current_user, :admin_project, @project) || @issue.author == current_user 9 - if can?(current_user, :admin_project, @project) || @issue.author == current_user
10 - if @issue.closed 10 - if @issue.closed
11 - = link_to 'Reopen', project_issue_path(@project, @issue, issue: {closed: false }, status_only: true), method: :put, class: "btn grouped success" 11 + = link_to 'Reopen', project_issue_path(@project, @issue, issue: {closed: false }, status_only: true), method: :put, class: "btn grouped reopen_issue"
12 - else 12 - else
13 - = link_to 'Close', project_issue_path(@project, @issue, issue: {closed: true }, status_only: true), method: :put, class: "btn grouped danger", title: "Close Issue" 13 + = link_to 'Close', project_issue_path(@project, @issue, issue: {closed: true }, status_only: true), method: :put, class: "btn grouped close_issue", title: "Close Issue"
14 - if can?(current_user, :admin_project, @project) || @issue.author == current_user 14 - if can?(current_user, :admin_project, @project) || @issue.author == current_user
15 = link_to edit_project_issue_path(@project, @issue), class: "btn grouped" do 15 = link_to edit_project_issue_path(@project, @issue), class: "btn grouped" do
16 %i.icon-edit 16 %i.icon-edit