diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 1cfcbcedc60b6b829dfe8dff3869d70479c39c2e..20b7463d1a425b21f0f4ea222e200f0916fa51ee 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -327,11 +327,6 @@ img.emoji { margin-bottom: 10px; } -.group-name { - font-size: 14px; - line-height: 24px; -} - table { td.permission-x { background: #D9EDF7 !important; diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss index 6b6e92eb0af5f619cc893112d22e5925f64882a0..720d3a8fbd59bbe86ef2d3588abaaceb3326ac33 100644 --- a/app/assets/stylesheets/sections/dashboard.scss +++ b/app/assets/stylesheets/sections/dashboard.scss @@ -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; } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 157518c4bac0aa513fe11b26abe361ae6a762f5d..7ca52598cfb7274069f5495685102993d7e13e7c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -136,14 +136,6 @@ module ApplicationHelper 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}", diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 4fc02a0ed13ba66fb245aa1a516b411ef0bd9dc7..33ae41343068702981679778d8161521fc11fafe 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -187,4 +187,12 @@ module ProjectsHelper 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 diff --git a/app/views/dashboard/_project.html.haml b/app/views/dashboard/_project.html.haml index 5792a015967b8261c060e2a555539e7648e4d962..db445eed2334e43b022f3046b7e97dd8155c7227 100644 --- a/app/views/dashboard/_project.html.haml +++ b/app/views/dashboard/_project.html.haml @@ -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)