Commit 6721215f authored by Robert Speicher's avatar Robert Speicher

Merge branch '8-1-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-1-stable

parents 8fe4352e e913ab73
...@@ -153,8 +153,3 @@ ...@@ -153,8 +153,3 @@
} }
} }
} }
.fa-align {
top: 20px;
position: relative;
}
...@@ -515,3 +515,10 @@ pre.light-well { ...@@ -515,3 +515,10 @@ pre.light-well {
.project-show-readme .readme-holder { .project-show-readme .readme-holder {
padding: 7px; padding: 7px;
} }
.edit-project-readme {
position: relative;
top: 20px;
z-index: 100;
color: $gl-gray;
}
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.pull-right .pull-right
   
- if can?(current_user, :push_code, @project) - if can?(current_user, :push_code, @project)
= link_to namespace_project_edit_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)), class: 'light' do = link_to namespace_project_edit_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)), class: 'edit-project-readme' do
%i.fa-align.fa.fa-pencil %i.fa-align.fa.fa-pencil
.wiki .wiki
= cache(readme_cache_key) do = cache(readme_cache_key) do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment