Commit 69f0defc authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'project-name' into 'master'

Add project name to project head

I felt that something was missing between the avatar and description.

![Screen_Shot_2015-08-06_at_15.11.41](https://gitlab.com/gitlab-org/gitlab-ce/uploads/35935d81950351118ffbc8002814e411/Screen_Shot_2015-08-06_at_15.11.41.png)

cc @dzaporozhets 

See merge request !1106
parents 912233ec 674e1c74
No related merge requests found
......@@ -48,6 +48,10 @@
display: block;
}
.project-home-desc {
font-size: 21px;
}
.project-repo-buttons,
.git-clone-holder {
display: none;
......
......@@ -30,7 +30,13 @@
}
}
.lead {
.project-home-desc {
h1 {
margin: 0;
margin-bottom: 10px;
font-size: 26px;
}
p {
display: inline;
}
......
......@@ -3,6 +3,7 @@
.project-identicon-holder
= project_icon(@project, alt: '', class: 'project-avatar avatar s90')
.project-home-desc.lead
%h1= @project.name
- if @project.description.present?
= markdown(@project.description, pipeline: :description)
......
......@@ -22,9 +22,9 @@ feature 'Project', feature: true do
end
it 'sanitizes unwanted tags' do
project.update_attribute(:description, '# Project Description')
project.update_attribute(:description, "```\ncode\n```")
visit path
expect(page).not_to have_css('.project-home-desc h1')
expect(page).not_to have_css('.project-home-desc code')
end
it 'permits `rel` attribute on links' 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