diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-18 17:27:50 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-20 00:17:21 -0500 |
| commit | a091483b7a70f0f94bea09c8884741e636031c41 (patch) | |
| tree | 687a0b37b2419de913242b876493b1fe52be8a69 /app | |
| parent | 91bd0bf99e0e25351c19bec28f9e5264a2fc469d (diff) | |
| download | gitlab-ce-a091483b7a70f0f94bea09c8884741e636031c41.tar.gz | |
Some fixes from last code review.
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_project.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/forks/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 0e2fccb80b4..0643b03ed26 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -584,7 +584,7 @@ pre.light-well { width: 160px; } - .fork_link { + .fork-link { float: right; margin-left: $gl-padding; diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 292faf0e7eb..319974e12c5 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -100,7 +100,7 @@ - if project_nav_tab? :forks = nav_link(controller: :forks, action: :index) do - = link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks', class: 'shortcuts-wiki' do + = link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks' do = icon('code-fork fw') %span Forks diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml index ae866dedfbd..a5ca641558e 100644 --- a/app/views/projects/forks/index.html.haml +++ b/app/views/projects/forks/index.html.haml @@ -30,7 +30,7 @@ = link_to page_filter_path(sort: sort_value_oldest_updated, without: excluded_filters) do = sort_title_oldest_updated - .fork_link.inline + .fork-link.inline - 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: 'pull-right btn btn-new' do = icon('code-fork fw') diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index c1dcdb9f0b2..2aeeed63c95 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -33,11 +33,11 @@ - if forks %span - %i.fa.fa-code-fork + = icon('code-fork') = project.forks_count - if stars %span - %i.fa.fa-star + = icon('star') = project.star_count - if show_last_commit_as_description .project-description |