diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-10-22 18:53:17 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-10-22 18:53:17 +0300 |
| commit | 6721215fa9713a620af4d8e8c096db8e93225548 (patch) | |
| tree | 7dfa6d2c88f6668603cc99c3e4b58c587824bc78 | |
| parent | 8fe4352eba29a2642e7bb39f95f284700593e24e (diff) | |
| parent | e913ab737c0f0c87f42439ba6de635774a1dfced (diff) | |
Merge branch '8-1-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-1-stable
| -rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 7 | ||||
| -rw-r--r-- | app/views/projects/_readme.html.haml | 2 |
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 - 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 |