Commit 45ee128e authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '32838-admin-panel-spacing' into 'master'

32838 Add wells to admin dashboard overview to fix spacing problems

Closes #32838

See merge request !12467
parents 98768953 9c7f3fab
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
color: $gl-text-color; color: $gl-text-color;
border: 1px solid $border-color; border: 1px solid $border-color;
border-radius: $border-radius-default; border-radius: $border-radius-default;
margin-bottom: $gl-padding;
.well-segment { .well-segment {
padding: $gl-padding; padding: $gl-padding;
...@@ -21,6 +22,11 @@ ...@@ -21,6 +22,11 @@
font-size: 12px; font-size: 12px;
} }
} }
&.admin-well h4 {
border-bottom: 1px solid $border-color;
padding-bottom: 8px;
}
} }
.icon-container { .icon-container {
...@@ -53,6 +59,14 @@ ...@@ -53,6 +59,14 @@
padding: 15px; padding: 15px;
} }
.dark-well {
background-color: $gray-normal;
.btn {
width: 100%;
}
}
.well-centered { .well-centered {
h1 { h1 {
font-weight: normal; font-weight: normal;
......
...@@ -5,8 +5,9 @@ ...@@ -5,8 +5,9 @@
.admin-dashboard.prepend-top-default .admin-dashboard.prepend-top-default
.row .row
.col-md-4 .col-md-4
.info-well
.well-segment.admin-well
%h4 Statistics %h4 Statistics
%hr
%p %p
Forks Forks
%span.light.pull-right %span.light.pull-right
...@@ -40,9 +41,9 @@ ...@@ -40,9 +41,9 @@
%span.light.pull-right %span.light.pull-right
= number_with_delimiter(User.active.count) = number_with_delimiter(User.active.count)
.col-md-4 .col-md-4
%h4 .info-well
Features .well-segment.admin-well
%hr %h4 Features
- sign_up = "Sign up" - sign_up = "Sign up"
%p{ "aria-label" => "#{sign_up}: status " + (signup_enabled? ? "on" : "off") } %p{ "aria-label" => "#{sign_up}: status " + (signup_enabled? ? "on" : "off") }
= sign_up = sign_up
...@@ -85,15 +86,14 @@ ...@@ -85,15 +86,14 @@
= gitlab_shared_runners = gitlab_shared_runners
%span.light.pull-right %span.light.pull-right
= boolean_to_icon gitlab_shared_runners_enabled = boolean_to_icon gitlab_shared_runners_enabled
.col-md-4 .col-md-4
.info-well
.well-segment.admin-well
%h4 %h4
Components Components
- if current_application_settings.version_check_enabled - if current_application_settings.version_check_enabled
.pull-right .pull-right
= version_status_badge = version_status_badge
%hr
%p %p
GitLab GitLab
%span.pull-right %span.pull-right
...@@ -118,66 +118,66 @@ ...@@ -118,66 +118,66 @@
Ruby Ruby
%span.pull-right %span.pull-right
#{RUBY_VERSION}p#{RUBY_PATCHLEVEL} #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}
%p %p
Rails Rails
%span.pull-right %span.pull-right
#{Rails::VERSION::STRING} #{Rails::VERSION::STRING}
%p %p
= Gitlab::Database.adapter_name = Gitlab::Database.adapter_name
%span.pull-right %span.pull-right
= Gitlab::Database.version = Gitlab::Database.version
%hr
.row .row
.col-sm-4 .col-sm-4
.light-well.well-centered .info-well.dark-well
%h4 Projects .well-segment.well-centered
.data
= link_to admin_projects_path do = link_to admin_projects_path do
%h1= number_with_delimiter(Project.cached_count) %h3.text-center
Projects:
= number_with_delimiter(Project.cached_count)
%hr %hr
= link_to('New project', new_project_path, class: "btn btn-new") = link_to('New project', new_project_path, class: "btn btn-new")
.col-sm-4 .col-sm-4
.light-well.well-centered .info-well.dark-well
%h4 Users .well-segment.well-centered
.data
= link_to admin_users_path do = link_to admin_users_path do
%h1= number_with_delimiter(User.count) %h3.text-center
Users:
= number_with_delimiter(User.count)
%hr %hr
= link_to 'New user', new_admin_user_path, class: "btn btn-new" = link_to 'New user', new_admin_user_path, class: "btn btn-new"
.col-sm-4 .col-sm-4
.light-well.well-centered .info-well.dark-well
%h4 Groups .well-segment.well-centered
.data
= link_to admin_groups_path do = link_to admin_groups_path do
%h1= number_with_delimiter(Group.count) %h3.text-center
Groups
= number_with_delimiter(Group.count)
%hr %hr
= link_to 'New group', new_admin_group_path, class: "btn btn-new" = link_to 'New group', new_admin_group_path, class: "btn btn-new"
.row
.row.prepend-top-10
.col-md-4 .col-md-4
.info-well
.well-segment.admin-well
%h4 Latest projects %h4 Latest projects
%hr
- @projects.each do |project| - @projects.each do |project|
%p %p
= link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project], class: 'str-truncated-60' = link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project], class: 'str-truncated-60'
%span.light.pull-right %span.light.pull-right
#{time_ago_with_tooltip(project.created_at)} #{time_ago_with_tooltip(project.created_at)}
.col-md-4 .col-md-4
.info-well
.well-segment.admin-well
%h4 Latest users %h4 Latest users
%hr
- @users.each do |user| - @users.each do |user|
%p %p
= link_to [:admin, user], class: 'str-truncated-60' do = link_to [:admin, user], class: 'str-truncated-60' do
= user.name = user.name
%span.light.pull-right %span.light.pull-right
#{time_ago_with_tooltip(user.created_at)} #{time_ago_with_tooltip(user.created_at)}
.col-md-4 .col-md-4
.info-well
.well-segment.admin-well
%h4 Latest groups %h4 Latest groups
%hr
- @groups.each do |group| - @groups.each do |group|
%p %p
= link_to [:admin, group], class: 'str-truncated-60' do = link_to [:admin, group], class: 'str-truncated-60' do
......
---
title: Add wells to admin dashboard overview to fix spacing problems
merge_request:
author:
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