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

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

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