diff options
| author | Martin Wortschack <mwortschack@gitlab.com> | 2019-02-06 11:02:01 +0100 |
|---|---|---|
| committer | Martin Wortschack <mwortschack@gitlab.com> | 2019-02-06 11:02:01 +0100 |
| commit | 8f73c2201a2990b4b0b1f1af60e2f385d106a44c (patch) | |
| tree | 3132afcb35e1663ccf6f6311260bfa90b56ce3fe | |
| parent | ca64341f7872c58c5ac9924938d45452a9f8fc19 (diff) | |
| download | gitlab-ce-56543-project-lists-further-iteration-improvements.tar.gz | |
Increase line height and remove margin of description56543-project-lists-further-iteration-improvements
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 6 | ||||
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index c8bfc864705..823e1bf02b3 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -947,6 +947,10 @@ pre.light-well { min-width: 0; margin-top: -$gl-padding-8; // negative margin required for flex-wrap flex: 1 1 100%; + + .project-title { + line-height: $gl-line-height-24; + } } p, @@ -1044,7 +1048,7 @@ pre.light-well { min-height: 40px; min-width: 40px; - .identicon.s64 { + .identicon.s48 { font-size: 16px; } } diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index efe93a28b97..df17ae95e2a 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -25,7 +25,7 @@ = project_icon(project, alt: '', class: 'avatar project-avatar s48', width: 48, height: 48) .project-details.d-sm-flex.flex-sm-fill.align-items-center .flex-wrapper - .d-flex.align-items-center.flex-wrap + .d-flex.align-items-center.flex-wrap.project-title %h2.d-flex.prepend-top-8 = link_to project_path(project), class: 'text-plain' do %span.project-full-name.append-right-8>< @@ -51,10 +51,10 @@ %span.user-access-role.d-block= Gitlab::Access.human_access(access) - if show_last_commit_as_description - .description.d-none.d-sm-block.prepend-top-8.append-right-default + .description.d-none.d-sm-block.append-right-default = link_to_markdown(project.commit.title, project_commit_path(project, project.commit), class: "commit-row-message") - elsif project.description.present? - .description.d-none.d-sm-block.prepend-top-8.append-right-default + .description.d-none.d-sm-block.append-right-default = markdown_field(project, :description) .controls.d-flex.flex-sm-column.align-items-center.align-items-sm-end.flex-wrap.flex-shrink-0{ class: css_controls_class } |