diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-08-01 08:11:47 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-01 08:11:47 +0000 |
| commit | 7a0ed87b2ccde084f71e7466ded761e9ef19cb5a (patch) | |
| tree | dbcf9dff5c255799a1c69523f8244a67cc33d229 | |
| parent | a5fdee61b6dd94cc6d0e87db59dcc7e554f0a796 (diff) | |
| parent | a54419f01f6cad33138e3d4ed049741699251f85 (diff) | |
| download | gitlab-ce-7a0ed87b2ccde084f71e7466ded761e9ef19cb5a.tar.gz | |
Merge branch 'new-issue-button-outline' into 'master'
Make "New issue" button in Issue page less obtrusive
## What does this MR do?
Replace green background of "New issue" button on issue page by green border and text.
## Why was this MR needed?
Every issue page has two green buttons—Comment and New Issue.
- New Issue is not directly content related and less likely to be used.
- [UI Guide] says
> Use green or blue button for primary action. Primary button should be only one.
[UI Guide]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/ui_guide.md
## What are the relevant issue numbers?
fixes #20186
## Screenshots
### Before
### After
See merge request !5457
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/help/ui.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 9075972e6d0..e85511e62ed 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -28,6 +28,7 @@ v 8.11.0 (unreleased) - Bump gitlab_git to speedup DiffCollection iterations - Make branches sortable without push permission !5462 (winniehell) - Check for Ci::Build artifacts at database level on pipeline partial + - Make "New issue" button in Issue page less obtrusive !5457 (winniehell) - Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska) - Add the `sprockets-es6` gem - Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska) diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 431d312b4ca..85e188d6f8b 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -189,7 +189,7 @@ %li %a Sort by date - = link_to 'New issue', '#', class: 'btn btn-new' + = link_to 'New issue', '#', class: 'btn btn-new btn-inverted' .lead Only nav links without button and search diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 9b6a97c0959..e5cce16a171 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -38,7 +38,7 @@ %li = link_to 'Edit', edit_namespace_project_issue_path(@project.namespace, @project, @issue) - if can?(current_user, :create_issue, @project) - = link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'hidden-xs hidden-sm btn btn-grouped new-issue-link btn-success', title: 'New issue', id: 'new_issue_link' do + = link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'hidden-xs hidden-sm btn btn-grouped new-issue-link btn-new btn-inverted', title: 'New issue', id: 'new_issue_link' do New issue - if can?(current_user, :update_issue, @issue) = link_to 'Reopen issue', issue_path(@issue, issue: { state_event: :reopen }, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "hidden-xs hidden-sm btn btn-grouped btn-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue' |