Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
e913ab73
Commit
e913ab73
authored
Oct 22, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-edit-readme' into '8-1-stable'
Fix edit readme link on project home page See merge request !1668
parents
d8a9acde
6b9b8298
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+0
-5
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+7
-0
app/views/projects/_readme.html.haml
app/views/projects/_readme.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/mixins.scss
View file @
e913ab73
...
@@ -153,8 +153,3 @@
...
@@ -153,8 +153,3 @@
}
}
}
}
}
}
.fa-align
{
top
:
20px
;
position
:
relative
;
}
app/assets/stylesheets/pages/projects.scss
View file @
e913ab73
...
@@ -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
;
}
app/views/projects/_readme.html.haml
View file @
e913ab73
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment