Commit 4bf446cb91cb14f8631f7f9db198d976d7e3d47f
Exists in
spb-stable
and in
3 other branches
Merge branch 'ui/compact_projects_list' of /home/git/repositories/gitlab/gitlabhq
Showing
5 changed files
with
16 additions
and
34 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -327,11 +327,6 @@ img.emoji { | @@ -327,11 +327,6 @@ img.emoji { | ||
| 327 | margin-bottom: 10px; | 327 | margin-bottom: 10px; |
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | -.group-name { | ||
| 331 | - font-size: 14px; | ||
| 332 | - line-height: 24px; | ||
| 333 | -} | ||
| 334 | - | ||
| 335 | table { | 330 | table { |
| 336 | td.permission-x { | 331 | td.permission-x { |
| 337 | background: #D9EDF7 !important; | 332 | background: #D9EDF7 !important; |
app/assets/stylesheets/sections/dashboard.scss
| @@ -67,44 +67,36 @@ | @@ -67,44 +67,36 @@ | ||
| 67 | 67 | ||
| 68 | .project-row, .group-row { | 68 | .project-row, .group-row { |
| 69 | padding: 10px 12px !important; | 69 | padding: 10px 12px !important; |
| 70 | - | ||
| 71 | - .namespace-name { | ||
| 72 | - color: #666; | ||
| 73 | - font-weight: bold; | ||
| 74 | - } | 70 | + font-size: 14px; |
| 71 | + line-height: 24px; | ||
| 75 | 72 | ||
| 76 | a { | 73 | a { |
| 77 | display: block; | 74 | display: block; |
| 78 | } | 75 | } |
| 79 | 76 | ||
| 80 | .project-name, .group-name { | 77 | .project-name, .group-name { |
| 81 | - font-size: 15px; | 78 | + font-weight: 500; |
| 82 | } | 79 | } |
| 83 | 80 | ||
| 84 | .arrow { | 81 | .arrow { |
| 85 | float: right; | 82 | float: right; |
| 86 | - padding: 10px 5px; | 83 | + padding: 0px 5px; |
| 87 | margin: 0; | 84 | margin: 0; |
| 88 | font-size: 20px; | 85 | font-size: 20px; |
| 89 | color: #666; | 86 | color: #666; |
| 90 | } | 87 | } |
| 91 | 88 | ||
| 92 | .last-activity { | 89 | .last-activity { |
| 90 | + float: right; | ||
| 91 | + font-size: 12px; | ||
| 93 | color: #AAA; | 92 | color: #AAA; |
| 94 | display: block; | 93 | display: block; |
| 95 | - margin-top: 5px; | ||
| 96 | .date { | 94 | .date { |
| 97 | color: #777; | 95 | color: #777; |
| 98 | } | 96 | } |
| 99 | } | 97 | } |
| 100 | } | 98 | } |
| 101 | 99 | ||
| 102 | -.group-row { | ||
| 103 | - .arrow { | ||
| 104 | - padding: 2px 5px; | ||
| 105 | - } | ||
| 106 | -} | ||
| 107 | - | ||
| 108 | .project-access-icon { | 100 | .project-access-icon { |
| 109 | margin-left: 10px; | 101 | margin-left: 10px; |
| 110 | float: left; | 102 | float: left; |
| @@ -125,10 +117,8 @@ | @@ -125,10 +117,8 @@ | ||
| 125 | 117 | ||
| 126 | .dash-project-access-icon { | 118 | .dash-project-access-icon { |
| 127 | float: left; | 119 | float: left; |
| 128 | - margin-right: 5px; | ||
| 129 | - font-size: 18px; | ||
| 130 | - color: #BBB; | 120 | + margin-right: 3px; |
| 121 | + color: #999; | ||
| 131 | margin-bottom: 10px; | 122 | margin-bottom: 10px; |
| 132 | - margin-top: 2px; | ||
| 133 | width: 16px; | 123 | width: 16px; |
| 134 | } | 124 | } |
app/helpers/application_helper.rb
| @@ -136,14 +136,6 @@ module ApplicationHelper | @@ -136,14 +136,6 @@ module ApplicationHelper | ||
| 136 | Digest::SHA1.hexdigest string | 136 | Digest::SHA1.hexdigest string |
| 137 | end | 137 | end |
| 138 | 138 | ||
| 139 | - def project_last_activity(project) | ||
| 140 | - if project.last_activity_at | ||
| 141 | - time_ago_with_tooltip(project.last_activity_at, 'bottom', 'last_activity_time_ago') + " ago" | ||
| 142 | - else | ||
| 143 | - "Never" | ||
| 144 | - end | ||
| 145 | - end | ||
| 146 | - | ||
| 147 | def authbutton(provider, size = 64) | 139 | def authbutton(provider, size = 64) |
| 148 | file_name = "#{provider.to_s.split('_').first}_#{size}.png" | 140 | file_name = "#{provider.to_s.split('_').first}_#{size}.png" |
| 149 | image_tag("authbuttons/#{file_name}", | 141 | image_tag("authbuttons/#{file_name}", |
app/helpers/projects_helper.rb
| @@ -187,4 +187,12 @@ module ProjectsHelper | @@ -187,4 +187,12 @@ module ProjectsHelper | ||
| 187 | def default_clone_protocol | 187 | def default_clone_protocol |
| 188 | current_user ? "ssh" : "http" | 188 | current_user ? "ssh" : "http" |
| 189 | end | 189 | end |
| 190 | + | ||
| 191 | + def project_last_activity(project) | ||
| 192 | + if project.last_activity_at | ||
| 193 | + time_ago_with_tooltip(project.last_activity_at, 'bottom', 'last_activity_time_ago') + " ago" | ||
| 194 | + else | ||
| 195 | + "Never" | ||
| 196 | + end | ||
| 197 | + end | ||
| 190 | end | 198 | end |
app/views/dashboard/_project.html.haml