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

app/assets/stylesheets/framework/mixins.scss

@@ -153,8 +153,3 @@
     }
   }
 }
-
-.fa-align {
-  top: 20px;
-  position: relative;
-}

app/assets/stylesheets/pages/projects.scss

@@ -515,3 +515,10 @@ pre.light-well {
 .project-show-readme .readme-holder {
   padding: 7px;
 }
+
+.edit-project-readme {
+  position: relative;
+  top: 20px;
+  z-index: 100;
+  color: $gl-gray;
+}

app/views/projects/_readme.html.haml

@@ -4,7 +4,7 @@
       .pull-right
          
         - 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
     .wiki
       = cache(readme_cache_key) do