Commit dd364958 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'kp-fix-related-items-card-styles' into 'master'

Add class `card` along with `card-slim` for Related Items apps

Closes #12925

See merge request gitlab-org/gitlab-ee!14759
parents 25f0c43b b3add08e
...@@ -161,7 +161,7 @@ export default { ...@@ -161,7 +161,7 @@ export default {
<template> <template>
<div class="related-issues-block"> <div class="related-issues-block">
<div class="card-slim"> <div class="card card-slim">
<div :class="{ 'panel-empty-heading border-bottom-0': !hasBody }" class="card-header"> <div :class="{ 'panel-empty-heading border-bottom-0': !hasBody }" class="card-header">
<h3 class="card-title mt-0 mb-0 h5"> <h3 class="card-title mt-0 mb-0 h5">
{{ title }} {{ title }}
...@@ -237,7 +237,7 @@ export default { ...@@ -237,7 +237,7 @@ export default {
:class="{ :class="{
'user-can-drag': canReorder, 'user-can-drag': canReorder,
'sortable-row': canReorder, 'sortable-row': canReorder,
'card-slim': canReorder, 'card card-slim': canReorder,
}" }"
:data-key="issue.id" :data-key="issue.id"
:data-ordering-id="issuableOrderingId(issue)" :data-ordering-id="issuableOrderingId(issue)"
......
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
</div> </div>
<div <div
v-else v-else
class="related-items-tree card-slim mt-2" class="related-items-tree card card-slim mt-2"
:class="{ :class="{
'disabled-content': disableContents, 'disabled-content': disableContents,
'overflow-auto': directChildren.length > $options.OVERFLOW_AFTER, 'overflow-auto': directChildren.length > $options.OVERFLOW_AFTER,
......
...@@ -104,7 +104,7 @@ export default { ...@@ -104,7 +104,7 @@ export default {
</script> </script>
<template> <template>
<div class="card-slim sortable-row flex-grow-1"> <div class="card card-slim sortable-row flex-grow-1">
<div class="item-body card-body d-flex align-items-center p-2 p-xl-1 pl-xl-3"> <div class="item-body card-body d-flex align-items-center p-2 p-xl-1 pl-xl-3">
<div class="item-contents d-flex align-items-center flex-wrap flex-grow-1 flex-xl-nowrap"> <div class="item-contents d-flex align-items-center flex-wrap flex-grow-1 flex-xl-nowrap">
<div class="item-title d-flex align-items-center mb-1 mb-xl-0"> <div class="item-title d-flex align-items-center mb-1 mb-xl-0">
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
can_add_related_issues: "#{can?(current_user, :admin_issue_link, @issue)}", can_add_related_issues: "#{can?(current_user, :admin_issue_link, @issue)}",
help_path: help_page_path('user/project/issues/related_issues') } } help_path: help_page_path('user/project/issues/related_issues') } }
.related-issues-block .related-issues-block
.card-slim .card.card-slim
.card-header.panel-empty-heading.border-bottom-0 .card-header.panel-empty-heading.border-bottom-0
%h3.card-title.mt-0.mb-0.h5 %h3.card-title.mt-0.mb-0.h5
Related issues Related issues
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