diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-28 10:51:18 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-28 10:51:18 +0200 |
| commit | fd9a8c36010e6fe9377f75eff044d7551761c2b6 (patch) | |
| tree | 8a734906be80965ca79d9ff68b76351eaad2ce8f | |
| parent | a184fcf368686f8224315c8afa6e5ec923e37c4b (diff) | |
| download | gitlab-ce-fd9a8c36010e6fe9377f75eff044d7551761c2b6.tar.gz | |
Add group avatar to group page. Changed default avatar for group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/images/no_group_avatar.png | bin | 704 -> 4884 bytes | |||
| -rw-r--r-- | app/views/dashboard/_groups.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/show.html.haml | 10 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/images/no_group_avatar.png b/app/assets/images/no_group_avatar.png Binary files differindex dac3ab1bb89..a97d4515982 100644 --- a/app/assets/images/no_group_avatar.png +++ b/app/assets/images/no_group_avatar.png diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml index dd8d85971b3..2ff1c33c53a 100644 --- a/app/views/dashboard/_groups.html.haml +++ b/app/views/dashboard/_groups.html.haml @@ -10,7 +10,7 @@ - groups.each do |group| %li.group-row = link_to group_path(id: group.path), class: dom_class(group) do - = image_tag group_icon(group.path), class: "avatar s32" + = image_tag group_icon(group.path), class: "avatar s24" %span.group-name.filter-title = truncate(group.name, length: 35) %span.arrow diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 5332d383c4c..6780010031e 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -13,9 +13,13 @@ %p.nothing_here_message Project activity will be displayed here .loading.hide .side.col-md-4 - - if @group.description.present? - .description-block - = @group.description + .light-well.append-bottom-20 + = image_tag group_icon(@group.path), class: "avatar s90" + .clearfix.light + %h3.page-title + = @group.name + - if @group.description.present? + %p= @group.description = render "projects", projects: @projects .prepend-top-20 = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed" do |
