diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-21 03:36:36 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-21 03:36:36 +0000 |
| commit | aa060e68ee004ac0175682afd30357a26129c0de (patch) | |
| tree | 166f44dda1b3baa9ba2d5aca24e41f76081cb968 /app | |
| parent | 73403c4ca77c62388858775b2e73e9d4341fe472 (diff) | |
| parent | a768c04ba511b5f98071d45c31d5c017dd7e4282 (diff) | |
| download | gitlab-ce-aa060e68ee004ac0175682afd30357a26129c0de.tar.gz | |
Merge branch 'dz-fix-fork-counter' into 'master'
Fix fork counter ui bug for safari
## What does this MR do?
Fixes UI bug on safari when fork button has blue arrow
## Screenshots
See merge request !4221
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/buttons/_fork.html.haml | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index a3690e40e28..b4702b31182 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -149,6 +149,10 @@ white-space: nowrap; margin: 0 11px 0 4px; + a { + color: inherit; + } + &:hover { background: #fff; } @@ -161,7 +165,7 @@ display: inline-table; margin-right: 12px; - a { + > a { margin: -1px; } } diff --git a/app/views/projects/buttons/_fork.html.haml b/app/views/projects/buttons/_fork.html.haml index 5fb5fe5af2f..34ad9fe2c43 100644 --- a/app/views/projects/buttons/_fork.html.haml +++ b/app/views/projects/buttons/_fork.html.haml @@ -12,7 +12,8 @@ = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn has-tooltip' do = icon('code-fork fw') Fork - = link_to namespace_project_forks_path(@project.namespace, @project), class: 'count-with-arrow' do + %div.count-with-arrow %span.arrow %span.count - = @project.forks_count + = link_to namespace_project_forks_path(@project.namespace, @project) do + = @project.forks_count |