Fix admin projects page in admin area

This commit is contained in:
Alfredo Sumaran 2017-03-29 20:01:45 +00:00 committed by Annabel Dunstone Gray
parent 79275ca0a1
commit fd167f2223
6 changed files with 36 additions and 17 deletions

View File

@ -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 {
> ul {
list-style-type: disc;

View File

@ -17,15 +17,7 @@
}
.group-row {
.stats {
float: right;
line-height: $list-text-height;
color: $gl-text-color;
span {
margin-right: 15px;
}
}
@include basic-list-stats;
}
.ldap-group-links {

View File

@ -573,9 +573,19 @@ pre.light-well {
display: flex;
flex-direction: column;
// Disable Flexbox for admin page
&.admin-projects {
display: block;
.project-row {
display: block;
}
}
.project-row {
display: flex;
align-items: center;
@include basic-list-stats;
}
h3 {

View File

@ -1,15 +1,16 @@
.js-projects-list-holder
- if @projects.any?
%ul.projects-list.content-list
%ul.projects-list.content-list.admin-projects
- @projects.each_with_index do |project|
%li.project-row
%li.project-row{ class: ('no-description' if project.description.blank?) }
.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 '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
= link_to [:admin, project.namespace.becomes(Namespace), project] do
.dash-project-avatar
@ -20,7 +21,7 @@
- if project.namespace
= project.namespace.human_name
\/
%span.project-name.filter-title
%span.project-name
= project.name
- if project.description.present?

View File

@ -24,7 +24,7 @@
- if project.namespace && !skip_namespace
= project.namespace.human_name
\/
%span.project-name.filter-title
%span.project-name
= project.name
- if show_last_commit_as_description

View File

@ -0,0 +1,4 @@
---
title: Fix layout of projects page on admin area
merge_request:
author: