diff options
Diffstat (limited to 'app/views/admin/dashboard/index.html.haml')
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index bf00fbfd81d..bac237c35c7 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -22,29 +22,27 @@ .admin-dashboard.gl-mt-3 .h3.gl-mb-5.gl-mt-0= _('Instance overview') .row - - component_params = { body_options: { class: 'gl-display-flex gl-justify-content-space-between gl-align-items-center gl-p-6' }, - footer_options: { class: 'gl-bg-transparent'} } + - component_params = { body_options: { class: 'gl-display-flex gl-justify-content-space-between gl-align-items-baseline' } } .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new(**component_params) do |c| - c.with_body do %span - .d-flex.align-items-center + .gl-display-flex.gl-align-items-center = sprite_icon('project', size: 16, css_class: 'gl-text-gray-700') - %h3.gl-m-0.gl-ml-3= approximate_count_with_delimiters(@counts, Project) - .gl-mt-3.text-uppercase= s_('AdminArea|Projects') + %h3.gl-heading-2.gl-ml-3{ class: 'gl-mb-0!' }= approximate_count_with_delimiters(@counts, Project) + .gl-heading-4{ class: 'gl-mb-0!' }= s_('AdminArea|Projects') = render Pajamas::ButtonComponent.new(href: new_project_path) do = s_('AdminArea|New project') - c.with_footer do - .d-flex.align-items-center + .gl-display-flex.gl-align-items-center = link_to(s_('AdminArea|View latest projects'), admin_projects_path(sort: 'created_desc')) - = sprite_icon('chevron-right', size: 12, css_class: 'gl-text-gray-700 gl-ml-2') .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new(**component_params) do |c| - c.with_body do %span - .d-flex.align-items-center + .gl-display-flex.gl-align-items-center = sprite_icon('users', size: 16, css_class: 'gl-text-gray-700') - %h3.gl-m-0.gl-ml-3= approximate_count_with_delimiters(@counts, User) + %h3.gl-heading-2.gl-ml-3{ class: 'gl-mb-0!' }= approximate_count_with_delimiters(@counts, User) %span.gl-outline-0.gl-ml-3{ tabindex: "0", data: { container: "body", toggle: "popover", placement: "top", @@ -53,36 +51,35 @@ content: s_("AdminArea|All users created in the instance, including users who are not %{billable_users_link_start}billable users%{billable_users_link_end}.").html_safe % { billable_users_link_start: billable_users_link_start, billable_users_link_end: '</a>'.html_safe }, } } = sprite_icon('question-o', size: 16, css_class: 'gl-text-blue-600') - .gl-mt-3.text-uppercase + .gl-heading-4{ class: 'gl-mb-0!' } = s_('AdminArea|Users') - = link_to(s_('AdminArea|Users statistics'), admin_dashboard_stats_path, class: "text-capitalize gl-ml-2") = render Pajamas::ButtonComponent.new(href: new_admin_user_path) do = s_('AdminArea|New user') - c.with_footer do - .d-flex.align-items-center + .gl-display-flex.gl-flex-wrap.gl-align-items-center.gl-gap-2 = link_to(s_('AdminArea|View latest users'), admin_users_path({ sort: 'created_desc' })) - = sprite_icon('chevron-right', size: 12, css_class: 'gl-text-gray-700 gl-ml-2') + %span.gl-text-secondary= "/" + = link_to(s_('AdminArea|Users statistics'), admin_dashboard_stats_path, class: "gl-font-base gl-font-weight-normal gl-text-capitalize") .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new(**component_params) do |c| - c.with_body do %span - .d-flex.align-items-center + .gl-display-flex.gl-align-items-center = sprite_icon('group', size: 16, css_class: 'gl-text-gray-700') - %h3.gl-m-0.gl-ml-3= approximate_count_with_delimiters(@counts, Group) - .gl-mt-3.text-uppercase= s_('AdminArea|Groups') + %h3.gl-heading-2.gl-ml-3{ class: 'gl-mb-0!' }= approximate_count_with_delimiters(@counts, Group) + .gl-heading-4{ class: 'gl-mb-0!' }= s_('AdminArea|Groups') = render Pajamas::ButtonComponent.new(href: new_admin_group_path) do = s_('AdminArea|New group') - c.with_footer do - .d-flex.align-items-center + .gl-display-flex.gl-align-items-center = link_to(s_('AdminArea|View latest groups'), admin_groups_path(sort: 'created_desc')) - = sprite_icon('chevron-right', size: 12, css_class: 'gl-text-gray-700 gl-ml-2') .row .col-md-4.gl-mb-6 #js-admin-statistics-container .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new do |c| - c.with_body do - %h4= s_('AdminArea|Features') + %h4.gl-heading-4= s_('AdminArea|Features') = feature_entry(_('Sign up'), href: general_admin_application_settings_path(anchor: 'js-signup-settings'), enabled: allow_signup?) @@ -121,7 +118,7 @@ .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new do |c| - c.with_body do - %h4 + %h4.gl-heading-4 = s_('AdminArea|Components') - if show_version_check? .float-right @@ -179,7 +176,7 @@ .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new do |c| - c.with_body do - %h4= s_('AdminArea|Latest projects') + %h4.gl-heading-4= s_('AdminArea|Latest projects') - @projects.each do |project| .gl-display-flex.gl-py-3 .gl-mr-auto.gl-overflow-hidden.gl-text-overflow-ellipsis @@ -189,7 +186,7 @@ .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new do |c| - c.with_body do - %h4= s_('AdminArea|Latest users') + %h4.gl-heading-4= s_('AdminArea|Latest users') - @users.each do |user| .gl-display-flex.gl-py-3 .gl-mr-auto.gl-overflow-hidden.gl-text-overflow-ellipsis @@ -200,7 +197,7 @@ .col-md-4.gl-mb-6 = render Pajamas::CardComponent.new do |c| - c.with_body do - %h4= s_('AdminArea|Latest groups') + %h4.gl-heading-4= s_('AdminArea|Latest groups') - @groups.each do |group| .gl-display-flex.gl-py-3 .gl-mr-auto.gl-overflow-hidden.gl-text-overflow-ellipsis |