diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-26 15:02:34 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-26 15:02:34 +0100 |
| commit | 012ea64d0027c3c047448fd5992f0312dac1d525 (patch) | |
| tree | 11b1c5de9274fbabcbf07d0510ae60e406baefab /app/views | |
| parent | d51f3b7b3533d44200455d361ee29ef13b121e40 (diff) | |
| download | gitlab-ce-012ea64d0027c3c047448fd5992f0312dac1d525.tar.gz | |
Fix description margin for groups list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/help/ui.html.haml | 22 | ||||
| -rw-r--r-- | app/views/shared/groups/_group.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 4 |
3 files changed, 24 insertions, 4 deletions
diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 746386cab58..f3f687eb6d9 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -64,8 +64,10 @@ %h2#lists Lists - %h4 + .lead + Simple list using %code .content-list + %ul.content-list %li One item @@ -74,6 +76,24 @@ %li 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 %code .well-list %ul.well-list diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml index 389a17786a8..fb9a8db0889 100644 --- a/app/views/shared/groups/_group.html.haml +++ b/app/views/shared/groups/_group.html.haml @@ -30,5 +30,5 @@ %span #{group_member.human_access} - if group.description.present? - .light + .description = markdown(group.description, pipeline: :description) diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 52182f2b4bd..99e48e86e38 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -43,9 +43,9 @@ title: "#{visibility_level_label(project.visibility_level)} - #{project_visibility_level_description(project.visibility_level)}"} = visibility_level_icon(project.visibility_level, fw: false) - if show_last_commit_as_description - .project-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? - .project-description + .description = markdown(project.description, pipeline: :description) |