diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-03 17:21:48 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-03 17:21:48 +0200 |
| commit | 0195b085a191dfa07799dcc0f232f76954910124 (patch) | |
| tree | 360293017658c029f53ae6540936d9e73f268686 | |
| parent | aeeb31d6b7073921603fefd9118a50f28742009f (diff) | |
| download | gitlab-ce-0195b085a191dfa07799dcc0f232f76954910124.tar.gz | |
Style groups page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/stylesheets/generic/lists.scss | 4 | ||||
| -rw-r--r-- | app/views/dashboard/groups/index.html.haml | 11 | ||||
| -rw-r--r-- | app/views/shared/groups/_group.html.haml | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/stylesheets/generic/lists.scss b/app/assets/stylesheets/generic/lists.scss index 766992d7afe..04a98fc6958 100644 --- a/app/assets/stylesheets/generic/lists.scss +++ b/app/assets/stylesheets/generic/lists.scss @@ -109,6 +109,10 @@ ul.content-list { padding: 18px; border-color: #f1f2f4; margin: 0 -18px; + + .avatar { + margin-right: 15px; + } } } diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml index fbe523b4b66..0c7f8a6f2f9 100644 --- a/app/views/dashboard/groups/index.html.haml +++ b/app/views/dashboard/groups/index.html.haml @@ -1,14 +1,17 @@ - page_title "Groups" = render 'dashboard/groups_head' -.slead - Group members have access to all group projects. +.gray-content-block - if current_user.can_create_group? %span.pull-right.hidden-xs - = link_to new_group_path, class: "btn btn-new btn-sm" do + = link_to new_group_path, class: "btn btn-new" do %i.fa.fa-plus New Group -%ul.bordered-list + Welcome to the groups! + %br + Group members have access to all group projects. + +%ul.content-list - @group_members.each do |group_member| - group = group_member.group = render 'shared/groups/group', group: group, group_member: group_member diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml index 229ae359bc5..2d7f911e351 100644 --- a/app/views/shared/groups/_group.html.haml +++ b/app/views/shared/groups/_group.html.haml @@ -11,7 +11,7 @@ %i.fa.fa-sign-out Leave - = image_tag group_icon(group), class: "avatar s40 avatar-tile hidden-xs" + = image_tag group_icon(group), class: "avatar s48 hidden-xs" = link_to group, class: 'group-name' do %strong= group.name |