Commit dba99c4b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets Committed by Kushal Pandya

Put CI status before start count on projects list

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 3840c7b5
...@@ -889,11 +889,7 @@ pre.light-well { ...@@ -889,11 +889,7 @@ pre.light-well {
@include basic-list-stats; @include basic-list-stats;
display: flex; display: flex;
align-items: center; align-items: center;
padding: $gl-padding 0; padding: $gl-padding-12 0;
@include media-breakpoint-up(lg) {
padding: $gl-padding 0;
}
&.no-description { &.no-description {
@include media-breakpoint-up(sm) { @include media-breakpoint-up(sm) {
...@@ -909,7 +905,7 @@ pre.light-well { ...@@ -909,7 +905,7 @@ pre.light-well {
} }
h2 { h2 {
font-size: $gl-font-size-large; font-size: $gl-font-size;
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
margin-bottom: 0; margin-bottom: 0;
...@@ -951,6 +947,7 @@ pre.light-well { ...@@ -951,6 +947,7 @@ pre.light-well {
.description { .description {
line-height: 1.5; line-height: 1.5;
color: $gl-text-color-secondary;
} }
@include media-breakpoint-down(md) { @include media-breakpoint-down(md) {
...@@ -1096,7 +1093,6 @@ pre.light-well { ...@@ -1096,7 +1093,6 @@ pre.light-well {
&:not(.explore) { &:not(.explore) {
.forks { .forks {
display: none; display: none;
} }
} }
......
...@@ -60,6 +60,11 @@ ...@@ -60,6 +60,11 @@
.controls.d-flex.flex-sm-column.align-items-center.align-items-sm-end.flex-wrap.flex-shrink-0.text-secondary{ class: css_controls_class } .controls.d-flex.flex-sm-column.align-items-center.align-items-sm-end.flex-wrap.flex-shrink-0.text-secondary{ class: css_controls_class }
.icon-container.d-flex.align-items-center .icon-container.d-flex.align-items-center
- if pipeline_status && can?(current_user, :read_cross_project) && project.pipeline_status.has_status? && can?(current_user, :read_build, project)
- pipeline_path = pipelines_project_commit_path(project.pipeline_status.project, project.pipeline_status.sha, ref: project.pipeline_status.ref)
%span.icon-wrapper.pipeline-status
= render 'ci/status/icon', status: project.commit.last_pipeline.detailed_status(current_user), tooltip_placement: 'top', path: pipeline_path
- if project.archived - if project.archived
%span.d-flex.icon-wrapper.badge.badge-warning archived %span.d-flex.icon-wrapper.badge.badge-warning archived
- if stars - if stars
...@@ -86,10 +91,6 @@ ...@@ -86,10 +91,6 @@
title: _('Issues'), data: { container: 'body', placement: 'top' } do title: _('Issues'), data: { container: 'body', placement: 'top' } do
= sprite_icon('issues', size: 14, css_class: 'append-right-4') = sprite_icon('issues', size: 14, css_class: 'append-right-4')
= number_with_delimiter(project.open_issues_count) = number_with_delimiter(project.open_issues_count)
- if pipeline_status && can?(current_user, :read_cross_project) && project.pipeline_status.has_status? && can?(current_user, :read_build, project)
- pipeline_path = pipelines_project_commit_path(project.pipeline_status.project, project.pipeline_status.sha, ref: project.pipeline_status.ref)
%span.icon-wrapper.pipeline-status
= render 'ci/status/icon', status: project.commit.last_pipeline.detailed_status(current_user), tooltip_placement: 'top', path: pipeline_path
.updated-note .updated-note
%span %span
= _('Updated') = _('Updated')
......
---
title: Improve projects list page UI
merge_request: 16656
author:
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