Commit c0e4f65d authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '284597-remove-bootstrap-4-s-cards-components-from-dashboard-todos' into 'master'

Remove Bootstrap 4's Cards components from Issuables and Todos

See merge request gitlab-org/gitlab!48004
parents a0e44758 a13b6b19
...@@ -235,10 +235,6 @@ h3.popover-header { ...@@ -235,10 +235,6 @@ h3.popover-header {
@extend .border-0; @extend .border-0;
} }
&.card-without-margin {
margin: 0;
}
&.bg-light { &.bg-light {
@extend .border-0; @extend .border-0;
} }
......
...@@ -234,6 +234,8 @@ ul.content-list { ...@@ -234,6 +234,8 @@ ul.content-list {
} }
} }
ul.content-list.issuable-list > li,
ul.content-list.todos-list > li,
.card > .content-list > li { .card > .content-list > li {
padding: $gl-padding-top $gl-padding; padding: $gl-padding-top $gl-padding;
} }
......
...@@ -85,9 +85,8 @@ ...@@ -85,9 +85,8 @@
- if @todos.any? - if @todos.any?
.js-todos-list-container{ data: { qa_selector: "todos_list_container" } } .js-todos-list-container{ data: { qa_selector: "todos_list_container" } }
.js-todos-options{ data: { per_page: @todos.limit_value, current_page: @todos.current_page, total_pages: @todos.total_pages } } .js-todos-options{ data: { per_page: @todos.limit_value, current_page: @todos.current_page, total_pages: @todos.total_pages } }
.card.card-without-border.card-without-margin %ul.content-list.todos-list
%ul.content-list.todos-list = render @todos
= render @todos
= paginate @todos, theme: "gitlab" = paginate @todos, theme: "gitlab"
.js-nothing-here-container.todos-all-done.hidden.svg-content .js-nothing-here-container.todos-all-done.hidden.svg-content
= image_tag 'illustrations/todos_all_done.svg' = image_tag 'illustrations/todos_all_done.svg'
......
- if @issues.to_a.any? - if @issues.to_a.any?
.card.card-without-border %ul.content-list.issues-list.issuable-list{ class: ("manual-ordering" if @sort == 'relative_position'), data: { group_full_path: @group&.full_path } }
%ul.content-list.issues-list.issuable-list{ class: ("manual-ordering" if @sort == 'relative_position'), data: { group_full_path: @group&.full_path } } = render partial: 'projects/issues/issue', collection: @issues
= render partial: 'projects/issues/issue', collection: @issues
= paginate @issues, theme: "gitlab" = paginate @issues, theme: "gitlab"
- else - else
= render 'shared/empty_states/issues' = render 'shared/empty_states/issues'
- if @merge_requests.to_a.any? - if @merge_requests.to_a.any?
.card.card-without-border %ul.content-list.mr-list.issuable-list
%ul.content-list.mr-list.issuable-list = render partial: 'projects/merge_requests/merge_request', collection: @merge_requests
= render partial: 'projects/merge_requests/merge_request', collection: @merge_requests
= paginate @merge_requests, theme: "gitlab" = paginate @merge_requests, theme: "gitlab"
......
---
title: Remove Bootstrap 4's Cards components from Issuables and Todos
merge_request: 48004
author: Takuya Noguchi
type: performance
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