diff options
| author | winniehell <git@winniehell.de> | 2016-07-23 02:15:08 +0200 |
|---|---|---|
| committer | winniehell <git@winniehell.de> | 2016-07-23 02:35:43 +0200 |
| commit | f735a4b2d2013ec462d3b3813f747c850a94b1c0 (patch) | |
| tree | 803d493596e436b3233818952b4cdf899d470c0b | |
| parent | 46a17ffd5a200b4d2aca914ef5bafe46db1cb9bf (diff) | |
| download | gitlab-ce-f735a4b2d2013ec462d3b3813f747c850a94b1c0.tar.gz | |
Add green outline to New Branch button (!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 fa272755033..4f646893d6e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.11.0 (unreleased) - 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 - Load project invited groups and members eagerly in ProjectTeam#fetch_members 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 |