diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-05 09:34:39 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-05 09:34:39 +0000 |
| commit | 9d483a5c37473655d9204419376db7b2f05308e4 (patch) | |
| tree | e2a1991bbd747a3e47c17ef3139c4c7156af03e9 /app/views | |
| parent | 2ffe160df8a1ec2e610ee712f864d19f9e8b8f5e (diff) | |
| parent | 34096bf3494007ecc5135dfa9f661439c107ab60 (diff) | |
| download | gitlab-ce-9d483a5c37473655d9204419376db7b2f05308e4.tar.gz | |
Merge branch 'list-padding' into 'master'
New padding for lists
* improve consistency for list padding
* reduce padding for project/group/events lists
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fixes #12511
cc @jschatz1 @skyruler @creamzy
See merge request !2715
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/events/_event.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/groups/_group.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index 46432a92348..36fb2d51629 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -3,8 +3,8 @@ .event-item-timestamp #{time_ago_with_tooltip(event.created_at)} - = cache [event, current_application_settings, "v2.1"] do - = image_tag avatar_icon(event.author_email, 46), class: "avatar s46", alt:'' + = cache [event, current_application_settings, "v2.2"] do + = image_tag avatar_icon(event.author_email, 40), class: "avatar s40", alt:'' - if event.created_project? = render "events/event/created_project", event: event - elsif event.push? diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml index f7fe6b02641..289b0bfe1eb 100644 --- a/app/views/shared/groups/_group.html.haml +++ b/app/views/shared/groups/_group.html.haml @@ -21,7 +21,7 @@ = icon('users') = number_with_delimiter(group.users.count) - = image_tag group_icon(group), class: "avatar s46 hidden-xs" + = image_tag group_icon(group), class: "avatar s40 hidden-xs" = link_to group, class: 'group-name' do %span.item-title= group.name diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index e196fc51d2d..00bf9dcd2d5 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -16,9 +16,9 @@ - if avatar .dash-project-avatar - if use_creator_avatar - = image_tag avatar_icon(project.creator.email, 46), class: "avatar s46", alt:'' + = image_tag avatar_icon(project.creator.email, 40), class: "avatar s40", alt:'' - else - = project_icon(project, alt: '', class: 'avatar project-avatar s46') + = project_icon(project, alt: '', class: 'avatar project-avatar s40') %span.project-full-name %span.namespace-name - if project.namespace && !skip_namespace |