summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-06-22 18:07:58 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-06-22 18:07:58 +0100
commit687ec972d09e7e490e76ea14ca6590d9cf7a8d7d (patch)
treeac8bb7ae4447084df7197b4e933f87de6c6724d8
parentbb2654f03c1fbdc26b5349d78c6f5a860726f5f9 (diff)
downloadgitlab-ce-27630-polish-for-project-list-right-side-icon-outlining.tar.gz
Added a top and bottom row for project list table27630-polish-for-project-list-right-side-icon-outlining
-rw-r--r--app/assets/stylesheets/pages/projects.scss16
-rw-r--r--app/views/shared/projects/_project.html.haml47
2 files changed, 33 insertions, 30 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index d7a4ac0d131..42cc3d494e6 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -651,6 +651,7 @@ pre.light-well {
h3 {
font-size: $gl-font-size;
+ margin: 0;
}
a {
@@ -658,13 +659,20 @@ pre.light-well {
}
.project-row {
- padding: 10px 0;
- border-bottom: 1px solid $list-border-light;
+ height: 30px;
+
+ &.bottom {
+ border-bottom: 1px solid $list-border-light;
- &:last-of-type {
- border-bottom: none;
+ &:last-of-type {
+ border-bottom: none;
+ }
}
}
+
+ .project-updated {
+ text-align: right;
+ }
}
.commits-search-form {
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml
index 7268a76bba8..213fad97b99 100644
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
@@ -9,42 +9,31 @@
- cache_key = project_list_cache_key(project)
- updated_tooltip = time_ago_with_tooltip(project.last_activity_at)
-%tr.project-row{ class: css_class }
+%tr.project-row.top{ class: css_class }
= cache(cache_key) do
- if avatar
- %td
+ %td{ rowspan: '2' }
.avatar-container.s40
= link_to project_path(project), class: dom_class(project) do
- if use_creator_avatar
= image_tag avatar_icon(project.creator.email, 40), class: "avatar s40", alt:''
- else
= project_icon(project, alt: '', class: 'avatar project-avatar s40')
- %td
- .project-details
- %h3
- = link_to project_path(project), class: dom_class(project) do
- %span.project-full-name
- %span.namespace-name
- - if project.namespace && !skip_namespace
- = project.namespace.human_name
- \/
- %span.project-name
- = project.name
-
- - if show_last_commit_as_description
- .description
- = link_to_gfm project.commit.title, namespace_project_commit_path(project.namespace, project, project.commit),
- class: "commit-row-message"
- - elsif project.description.present?
- .description
- = markdown_field(project, :description)
- %td
+ %td.project-details
+ %h3
+ = link_to project_path(project), class: dom_class(project) do
+ %span.project-full-name
+ %span.namespace-name
+ - if project.namespace && !skip_namespace
+ = project.namespace.human_name
+ \/
+ %span.project-name
+ = project.name
- if project.archived
%span.label.label-warning archived
%td
- if project.pipeline_status.has_status?
- %span
- = render_project_pipeline_status(project.pipeline_status)
+ %span= render_project_pipeline_status(project.pipeline_status)
%td
- if forks
%span
@@ -58,5 +47,11 @@
%td
%span.visibility-icon.has-tooltip{ data: { container: 'body', placement: 'left' }, title: visibility_icon_description(project) }
= visibility_level_icon(project.visibility_level, fw: true)
- %td
- updated #{updated_tooltip}
+%tr.project-row.bottom{ class: css_class }
+ %td
+ - if show_last_commit_as_description
+ = link_to_gfm project.commit.title, namespace_project_commit_path(project.namespace, project, project.commit),
+ class: "commit-row-message"
+ - elsif project.description.present?
+ = markdown_field(project, :description)
+ %td.project-updated{ colspan: '5' } updated #{updated_tooltip}