diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-15 09:23:41 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-15 09:29:57 -0500 |
| commit | 13c62cdbfad1cc7f140d59f018b6004f92e6d3b5 (patch) | |
| tree | d773fe12f25a2a8c42fe8a918df05e0717eed5bb | |
| parent | 5aea280fa7017cc4eac814c31eb45e024ba84a1e (diff) | |
| download | gitlab-ce-fork-icon.tar.gz | |
Add svg icon color to btn-color mixinfork-icon
| -rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 14 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 11 | ||||
| -rw-r--r-- | app/views/projects/buttons/_fork.html.haml | 4 |
3 files changed, 19 insertions, 10 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index c6fe614f503..f87b8a2ad1c 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -51,16 +51,13 @@ } svg { - vertical-align: top; - position: relative; - top: 2px; path { - fill: $white-light; + fill: $color; } use { - stroke: $white-light; + stroke: $color; } } } @@ -189,9 +186,10 @@ } svg { - width: 16px; - height: auto; - vertical-align: middle; + height: 15px; + width: auto; + position: relative; + top: 2px; } } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index ea9f7cf0540..7c36ce85fb1 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -129,6 +129,17 @@ color: $layout-link-gray; } + svg { + + path { + fill: $layout-link-gray; + } + + use { + stroke: $layout-link-gray; + } + } + .fa-caret-down { margin-left: 3px; } diff --git a/app/views/projects/buttons/_fork.html.haml b/app/views/projects/buttons/_fork.html.haml index a9eaed4c5f6..a098a082854 100644 --- a/app/views/projects/buttons/_fork.html.haml +++ b/app/views/projects/buttons/_fork.html.haml @@ -2,7 +2,7 @@ - if current_user && can?(current_user, :fork_project, @project) - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2 = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn has-tooltip' do - = icon('code-fork fw') + = custom_icon('icon_fork') Fork %div.count-with-arrow %span.arrow @@ -10,7 +10,7 @@ = @project.forks_count - else = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn has-tooltip' do - = icon('code-fork fw') + = custom_icon('icon_fork') Fork %div.count-with-arrow %span.arrow |