Fix description margin for groups list

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2016-02-26 15:02:34 +01:00
parent d51f3b7b35
commit 012ea64d00
No known key found for this signature in database
GPG key ID: 627C5F589F467F17
5 changed files with 31 additions and 11 deletions

View file

@ -118,6 +118,13 @@ ul.content-list {
font-weight: 600; font-weight: 600;
} }
.description {
p {
@include str-truncated;
margin-bottom: 0;
}
}
.avatar { .avatar {
margin-right: 15px; margin-right: 15px;
} }

View file

@ -410,13 +410,6 @@ pre.light-well {
margin-left: 10px; margin-left: 10px;
} }
} }
.project-description {
p {
@include str-truncated;
margin-bottom: 0;
}
}
} }
.bottom { .bottom {

View file

@ -64,8 +64,10 @@
%h2#lists Lists %h2#lists Lists
%h4 .lead
Simple list using
%code .content-list %code .content-list
%ul.content-list %ul.content-list
%li %li
One item One item
@ -74,6 +76,24 @@
%li %li
One item One item
.lead
List with avatar, title and description using
%code .content-list
%ul.content-list
%li
= image_tag 'no_avatar.png', class: 'avatar s40'
.title Title
.description Description
%li
= image_tag 'no_avatar.png', class: 'avatar s40'
.title Title
.description Description
%li
= image_tag 'no_avatar.png', class: 'avatar s40'
.title Title
.description Description
%h4 %h4
%code .well-list %code .well-list
%ul.well-list %ul.well-list

View file

@ -30,5 +30,5 @@
%span #{group_member.human_access} %span #{group_member.human_access}
- if group.description.present? - if group.description.present?
.light .description
= markdown(group.description, pipeline: :description) = markdown(group.description, pipeline: :description)

View file

@ -43,9 +43,9 @@
title: "#{visibility_level_label(project.visibility_level)} - #{project_visibility_level_description(project.visibility_level)}"} title: "#{visibility_level_label(project.visibility_level)} - #{project_visibility_level_description(project.visibility_level)}"}
= visibility_level_icon(project.visibility_level, fw: false) = visibility_level_icon(project.visibility_level, fw: false)
- if show_last_commit_as_description - if show_last_commit_as_description
.project-description .description
= link_to_gfm project.commit.title, namespace_project_commit_path(project.namespace, project, project.commit), = link_to_gfm project.commit.title, namespace_project_commit_path(project.namespace, project, project.commit),
class: "commit-row-message" class: "commit-row-message"
- elsif project.description.present? - elsif project.description.present?
.project-description .description
= markdown(project.description, pipeline: :description) = markdown(project.description, pipeline: :description)