kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'new-branch-button-highlight' into 'master'

Browse source 
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

![before](/uploads/3bc890e249ef4c3852605a6350c05b9a/before.png)

### After

![after](/uploads/bc627902ffa7c7b4ab20ee7a269fa44f/after.png)

See merge request !5447
This commit is contained in:
Fatih Acet 2016-07-25 21:04:40 +00:00
commit 7ce3fe27b0
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -4,6 +4,7 @@ v 8.11.0 (unreleased)
- Remove magic comments (`# encoding: UTF-8`) from Ruby files !5456 (winniehell) - 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' - 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 - 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 - Retrieve rendered HTML from cache in one request
- Nokogiri's various parsing methods are now instrumented - Nokogiri's various parsing methods are now instrumented
- Make fork counter always clickable !5463 (winniehell) - Make fork counter always clickable !5463 (winniehell)

9
app/assets/stylesheets/framework/buttons.scss
View file

@ -135,6 +135,15 @@
@include btn-green; @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 { &.btn-gray {
@include btn-gray; @include btn-gray;
} }

2
app/views/projects/issues/_new_branch.html.haml
View file

@ -2,7 +2,7 @@
.pull-right .pull-right
#new-branch{'data-path' => can_create_branch_namespace_project_issue_path(@project.namespace, @project, @issue)} #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), = 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 .checking
= icon('spinner spin') = icon('spinner spin')
Checking branches Checking branches