Commit fd167f22 authored by Alfredo Sumaran's avatar Alfredo Sumaran Committed by Annabel Dunstone Gray

Fix admin projects page in admin area

parent 79275ca0
...@@ -52,6 +52,18 @@ ...@@ -52,6 +52,18 @@
} }
} }
@mixin basic-list-stats {
.stats {
float: right;
line-height: $list-text-height;
color: $gl-text-color;
span {
margin-right: 15px;
}
}
}
@mixin bulleted-list { @mixin bulleted-list {
> ul { > ul {
list-style-type: disc; list-style-type: disc;
......
...@@ -17,15 +17,7 @@ ...@@ -17,15 +17,7 @@
} }
.group-row { .group-row {
.stats { @include basic-list-stats;
float: right;
line-height: $list-text-height;
color: $gl-text-color;
span {
margin-right: 15px;
}
}
} }
.ldap-group-links { .ldap-group-links {
......
...@@ -573,9 +573,19 @@ pre.light-well { ...@@ -573,9 +573,19 @@ pre.light-well {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
// Disable Flexbox for admin page
&.admin-projects {
display: block;
.project-row {
display: block;
}
}
.project-row { .project-row {
display: flex; display: flex;
align-items: center; align-items: center;
@include basic-list-stats;
} }
h3 { h3 {
......
.js-projects-list-holder .js-projects-list-holder
- if @projects.any? - if @projects.any?
%ul.projects-list.content-list %ul.projects-list.content-list.admin-projects
- @projects.each_with_index do |project| - @projects.each_with_index do |project|
%li.project-row %li.project-row{ class: ('no-description' if project.description.blank?) }
.controls .controls
- if project.archived
%span.label.label-warning archived
%span.badge
= storage_counter(project.statistics.storage_size)
= link_to 'Edit', edit_namespace_project_path(project.namespace, project), id: "edit_#{dom_id(project)}", class: "btn" = link_to 'Edit', edit_namespace_project_path(project.namespace, project), id: "edit_#{dom_id(project)}", class: "btn"
= link_to 'Delete', [project.namespace.becomes(Namespace), project], data: { confirm: remove_project_message(project) }, method: :delete, class: "btn btn-remove" = link_to 'Delete', [project.namespace.becomes(Namespace), project], data: { confirm: remove_project_message(project) }, method: :delete, class: "btn btn-remove"
.stats
%span.badge
= storage_counter(project.statistics.storage_size)
- if project.archived
%span.label.label-warning archived
.title .title
= link_to [:admin, project.namespace.becomes(Namespace), project] do = link_to [:admin, project.namespace.becomes(Namespace), project] do
.dash-project-avatar .dash-project-avatar
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
- if project.namespace - if project.namespace
= project.namespace.human_name = project.namespace.human_name
\/ \/
%span.project-name.filter-title %span.project-name
= project.name = project.name
- if project.description.present? - if project.description.present?
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
- if project.namespace && !skip_namespace - if project.namespace && !skip_namespace
= project.namespace.human_name = project.namespace.human_name
\/ \/
%span.project-name.filter-title %span.project-name
= project.name = project.name
- if show_last_commit_as_description - if show_last_commit_as_description
......
---
title: Fix layout of projects page on admin area
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