summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-22 16:28:46 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-22 16:28:46 +0200
commit6b9b8298497ab35313fdccdb71d2d0440f6c3ad8 (patch)
treed8071290f9f1112093cef817fa9338c57bf2e938
parentd8a9acdeeec40f1d1a8a2ca799e4d2c8037552f4 (diff)
downloadgitlab-ce-fix-edit-readme.tar.gz
Fix edit readme link on project home pagefix-edit-readme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/stylesheets/framework/mixins.scss5
-rw-r--r--app/assets/stylesheets/pages/projects.scss7
-rw-r--r--app/views/projects/_readme.html.haml2
3 files changed, 8 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index 089e6958eeb..c4149fb4898 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -153,8 +153,3 @@
}
}
}
-
-.fa-align {
- top: 20px;
- position: relative;
-}
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index ec674fdf1c9..b29a3815628 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/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;
+}
diff --git a/app/views/projects/_readme.html.haml b/app/views/projects/_readme.html.haml
index 5bc1999ec9d..ca25fe6c90a 100644
--- a/app/views/projects/_readme.html.haml
+++ b/app/views/projects/_readme.html.haml
@@ -4,7 +4,7 @@
.pull-right
&nbsp;
- 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