Commit be1a7cff authored by Illya Klymov's avatar Illya Klymov

Merge branch...

Merge branch '326635-remove-str-truncated-60-class-from-app-views-admin-dashboard-index-html-haml' into 'master'

UI improvement of Admin Dashboard top page

See merge request gitlab-org/gitlab!58373
parents 261a0939 df6b26e8
...@@ -165,27 +165,30 @@ ...@@ -165,27 +165,30 @@
.gl-card-body .gl-card-body
%h4= s_('AdminArea|Latest projects') %h4= s_('AdminArea|Latest projects')
- @projects.each do |project| - @projects.each do |project|
%p .gl-display-flex.gl-py-3
= link_to project.full_name, admin_project_path(project), class: 'str-truncated-60' .gl-mr-auto.gl-overflow-hidden.gl-text-overflow-ellipsis
%span.light.float-right = link_to project.full_name, admin_project_path(project)
%span.gl-white-space-nowrap.gl-text-right
#{time_ago_with_tooltip(project.created_at)} #{time_ago_with_tooltip(project.created_at)}
.col-md-4.gl-mb-6 .col-md-4.gl-mb-6
.gl-card .gl-card
.gl-card-body .gl-card-body
%h4= s_('AdminArea|Latest users') %h4= s_('AdminArea|Latest users')
- @users.each do |user| - @users.each do |user|
%p .gl-display-flex.gl-py-3
= link_to [:admin, user], class: 'str-truncated-60' do .gl-mr-auto.gl-overflow-hidden.gl-text-overflow-ellipsis
= user.name = link_to [:admin, user] do
%span.light.float-right = user.name
%span.gl-white-space-nowrap.gl-text-right
#{time_ago_with_tooltip(user.created_at)} #{time_ago_with_tooltip(user.created_at)}
.col-md-4.gl-mb-6 .col-md-4.gl-mb-6
.gl-card .gl-card
.gl-card-body .gl-card-body
%h4= s_('AdminArea|Latest groups') %h4= s_('AdminArea|Latest groups')
- @groups.each do |group| - @groups.each do |group|
%p .gl-display-flex.gl-py-3
= link_to [:admin, group], class: 'str-truncated-60' do .gl-mr-auto.gl-overflow-hidden.gl-text-overflow-ellipsis
= group.full_name = link_to [:admin, group] do
%span.light.float-right = group.full_name
%span.gl-white-space-nowrap.gl-text-right
#{time_ago_with_tooltip(group.created_at)} #{time_ago_with_tooltip(group.created_at)}
---
title: UI improvement of Admin Dashboard top page
merge_request: 58373
author: Takuya Noguchi
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment