diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-25 21:04:40 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-07-25 21:04:40 +0000 |
| commit | 7ce3fe27b07e75a31c2cb238a56f5ca6d87ee747 (patch) | |
| tree | 4a93dbe19d796dcbeefc06ebee0205b6fce6fce6 | |
| parent | 9fead2b8271c4f3bb6c04a596253f80b09de9caa (diff) | |
| parent | f735a4b2d2013ec462d3b3813f747c850a94b1c0 (diff) | |
| download | gitlab-ce-7ce3fe27b07e75a31c2cb238a56f5ca6d87ee747.tar.gz | |
Merge branch 'new-branch-button-highlight' into 'master'
Add green outline to New Branch button
## What does this MR do?
Add green outline to New Branch button on issue page.
## Are there points in the code the reviewer needs to double check?
Nope.
## Why was this MR needed?
The button was not very visible.
## What are the relevant issue numbers?
fixes #18928
## Screenshots
### Before
### After
See merge request !5447
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 9 | ||||
| -rw-r--r-- | app/views/projects/issues/_new_branch.html.haml | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4d2c281b82d..ca4014461f0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ v 8.11.0 (unreleased) - Remove magic comments (`# encoding: UTF-8`) from Ruby files !5456 (winniehell) - Fix of 'Commits being passed to custom hooks are already reachable when using the UI' - Limit git rev-list output count to one in forced push check + - Add green outline to New Branch button !5447 (winniehell) - Retrieve rendered HTML from cache in one request - Nokogiri's various parsing methods are now instrumented - Make fork counter always clickable !5463 (winniehell) diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index f87b8a2ad1c..473530cf094 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -135,6 +135,15 @@ @include btn-green; } + &.btn-inverted { + &.btn-success, + &.btn-new, + &.btn-create, + &.btn-save { + @include btn-outline($white-light, $green-normal, $green-normal, $green-light, $white-light, $green-light); + } + } + &.btn-gray { @include btn-gray; } diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml index e93b7e0d66d..24749699c6d 100644 --- a/app/views/projects/issues/_new_branch.html.haml +++ b/app/views/projects/issues/_new_branch.html.haml @@ -2,7 +2,7 @@ .pull-right #new-branch{'data-path' => can_create_branch_namespace_project_issue_path(@project.namespace, @project, @issue)} = link_to namespace_project_branches_path(@project.namespace, @project, branch_name: @issue.to_branch_name, issue_iid: @issue.iid), - method: :post, class: 'btn has-tooltip', title: @issue.to_branch_name, disabled: 'disabled' do + method: :post, class: 'btn btn-new btn-inverted has-tooltip', title: @issue.to_branch_name, disabled: 'disabled' do .checking = icon('spinner spin') Checking branches |