mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-16 16:16:43 +10:00
Merge branch 'redesign-project-avatar' into 'master'
Redesign project avatar page See merge request !1437
This commit is contained in:
@@ -16,6 +16,8 @@
|
||||
|
||||
.project-home-panel {
|
||||
margin-bottom: 15px;
|
||||
position: relative;
|
||||
padding-left: 85px;
|
||||
|
||||
&.empty-project {
|
||||
border-bottom: 0px;
|
||||
@@ -23,6 +25,22 @@
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
.project-identicon-holder {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
|
||||
.avatar {
|
||||
width: 70px;
|
||||
height: 70px;
|
||||
@include border-radius(0px);
|
||||
}
|
||||
|
||||
.identicon {
|
||||
font-size: 45px;
|
||||
line-height: 1.6;
|
||||
}
|
||||
}
|
||||
|
||||
.project-home-dropdown {
|
||||
margin-left: 10px;
|
||||
float: right;
|
||||
@@ -36,10 +54,6 @@
|
||||
float: left;
|
||||
color: #666;
|
||||
font-size: 16px;
|
||||
|
||||
.avatar {
|
||||
margin-top: -5px;
|
||||
}
|
||||
}
|
||||
|
||||
.star-fork-buttons {
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
- empty_repo = @project.empty_repo?
|
||||
.project-home-panel{:class => ("empty-project" if empty_repo)}
|
||||
.project-identicon-holder
|
||||
= project_icon(@project.to_param, alt: '', class: 'avatar')
|
||||
.project-home-row
|
||||
.project-home-desc
|
||||
= project_icon(@project.to_param, alt: '', class: 'avatar s32')
|
||||
- if @project.description.present?
|
||||
= escaped_autolink(@project.description)
|
||||
- if can?(current_user, :admin_project, @project)
|
||||
|
||||
Reference in New Issue
Block a user