diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-04 11:17:25 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-04 11:17:25 +0200 |
| commit | c13ef898627db4f619c80f6be0fb58fe045e44d3 (patch) | |
| tree | e0dd46c4a1ae9c8097ee79c5126b1ab584a499b0 /app/views | |
| parent | 16e6913e00dee9118a2c75d6ecdd7f2dcef7234a (diff) | |
| download | gitlab-ce-c13ef898627db4f619c80f6be0fb58fe045e44d3.tar.gz | |
Make UI more compact
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/events/_event.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/groups/_group.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index 3cd65edacbf..9aacc79d686 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, "v2"] do - = image_tag avatar_icon(event.author_email, 48), class: "avatar s48", alt:'' + = cache [event, "v2.1"] do + = image_tag avatar_icon(event.author_email, 46), class: "avatar s46", alt:'' - if event.created_project? = render "events/event/created_project", event: event - elsif event.push? diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 9a9282de22a..02ee9910dad 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -14,7 +14,7 @@ = render partial: 'layouts/collapse_button' - if current_user = link_to current_user, class: 'sidebar-user' do - = image_tag avatar_icon(current_user.email, 60), alt: 'User activity', class: 'avatar avatar s48' + = image_tag avatar_icon(current_user.email, 60), alt: 'User activity', class: 'avatar avatar s46' .username = current_user.username .content-wrapper diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml index 55e6370811d..a54c5fa8c33 100644 --- a/app/views/shared/groups/_group.html.haml +++ b/app/views/shared/groups/_group.html.haml @@ -9,7 +9,7 @@ = link_to leave_group_group_members_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-sm btn btn-grouped", title: 'Leave this group' do %i.fa.fa-sign-out - = image_tag group_icon(group), class: "avatar s48 hidden-xs" + = image_tag group_icon(group), class: "avatar s46 hidden-xs" = link_to group, class: 'group-name' do %strong= group.name diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index fdedcf97cf8..5318c6011f4 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -3,11 +3,11 @@ - css_class = '' unless local_assigns[:css_class] - css_class += " no-description" unless project.description.present? %li.project-row{ class: css_class } - = cache [project.namespace, project, controller.controller_name, controller.action_name, 'v2'] do + = cache [project.namespace, project, controller.controller_name, controller.action_name, 'v2.1'] do = link_to project_path(project), class: dom_class(project) do - if avatar .dash-project-avatar - = project_icon(project, alt: '', class: 'avatar project-avatar s40') + = project_icon(project, alt: '', class: 'avatar project-avatar s46') %span.project-full-name %span.namespace-name - if project.namespace |