Commit 4bf446cb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'ui/compact_projects_list' of /home/git/repositories/gitlab/gitlabhq

......@@ -327,11 +327,6 @@ img.emoji {
margin-bottom: 10px;
}
.group-name {
font-size: 14px;
line-height: 24px;
}
table {
td.permission-x {
background: #D9EDF7 !important;
......
......@@ -67,44 +67,36 @@
.project-row, .group-row {
padding: 10px 12px !important;
.namespace-name {
color: #666;
font-weight: bold;
}
font-size: 14px;
line-height: 24px;
a {
display: block;
}
.project-name, .group-name {
font-size: 15px;
font-weight: 500;
}
.arrow {
float: right;
padding: 10px 5px;
padding: 0px 5px;
margin: 0;
font-size: 20px;
color: #666;
}
.last-activity {
float: right;
font-size: 12px;
color: #AAA;
display: block;
margin-top: 5px;
.date {
color: #777;
}
}
}
.group-row {
.arrow {
padding: 2px 5px;
}
}
.project-access-icon {
margin-left: 10px;
float: left;
......@@ -125,10 +117,8 @@
.dash-project-access-icon {
float: left;
margin-right: 5px;
font-size: 18px;
color: #BBB;
margin-right: 3px;
color: #999;
margin-bottom: 10px;
margin-top: 2px;
width: 16px;
}
......@@ -136,14 +136,6 @@ def hexdigest(string)
Digest::SHA1.hexdigest string
end
def project_last_activity(project)
if project.last_activity_at
time_ago_with_tooltip(project.last_activity_at, 'bottom', 'last_activity_time_ago') + " ago"
else
"Never"
end
end
def authbutton(provider, size = 64)
file_name = "#{provider.to_s.split('_').first}_#{size}.png"
image_tag("authbuttons/#{file_name}",
......
......@@ -187,4 +187,12 @@ def default_url_to_repo
def default_clone_protocol
current_user ? "ssh" : "http"
end
def project_last_activity(project)
if project.last_activity_at
time_ago_with_tooltip(project.last_activity_at, 'bottom', 'last_activity_time_ago') + " ago"
else
"Never"
end
end
end
......@@ -9,6 +9,3 @@
= truncate(project.name, length: 25)
%span.arrow
%i.icon-angle-right
%span.last-activity
%span Last activity:
%span.date= project_last_activity(project)
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