diff options
| author | Valeriy Sizov <vsv2711@gmail.com> | 2012-10-16 14:05:53 -0700 |
|---|---|---|
| committer | Valeriy Sizov <vsv2711@gmail.com> | 2012-10-16 14:05:53 -0700 |
| commit | d21443d1c6e8acd36f579e290c8b8cdcf70546fb (patch) | |
| tree | 7034eb4aadee518ce9cbc319fd36650f50790533 /app | |
| parent | 8ee8f36f6ea5155037d847d2c0876a363a4c1808 (diff) | |
| parent | fa4c38f32b3ac8aba6411e29ff01dfe8f336981d (diff) | |
| download | gitlab-ce-d21443d1c6e8acd36f579e290c8b8cdcf70546fb.tar.gz | |
Merge pull request #1713 from riyad/fix-issue-close-and-reopen-buttons
Fix issue close and reopen button text and styles
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/sections/issues.scss | 17 | ||||
| -rw-r--r-- | app/views/issues/_show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/issues/show.html.haml | 4 |
3 files changed, 20 insertions, 3 deletions
diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss index 485a97661a3..3ad9d6f7c81 100644 --- a/app/assets/stylesheets/sections/issues.scss +++ b/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; } } diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index 64401bdd85e..4b6823f53c7 100644 --- a/app/views/issues/_show.html.haml +++ b/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 diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index da2aeac433d..9114febdd02 100644 --- a/app/views/issues/show.html.haml +++ b/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 |