Commit a454614d authored by Clement Ho's avatar Clement Ho

Merge branch '6287-epics-page-styling-is-broken' into 'master'

Resolve "Epics Page Styling is broken"

Closes #6287

See merge request gitlab-org/gitlab-ee!5957
parents d230ec46 a0cb257c
...@@ -35,7 +35,12 @@ export default { ...@@ -35,7 +35,12 @@ export default {
</script> </script>
<template> <template>
<div class="hide-collapsed value issuable-show-labels js-value"> <div
class="hide-collapsed value issuable-show-labels js-value"
:class="{
'has-labels':!isEmpty,
}"
>
<span <span
v-if="isEmpty" v-if="isEmpty"
class="text-secondary" class="text-secondary"
...@@ -50,7 +55,7 @@ export default { ...@@ -50,7 +55,7 @@ export default {
> >
<span <span
v-tooltip v-tooltip
class="label color-label" class="badge color-label"
data-placement="bottom" data-placement="bottom"
data-container="body" data-container="body"
:style="labelStyle(label)" :style="labelStyle(label)"
......
...@@ -23,7 +23,10 @@ export default { ...@@ -23,7 +23,10 @@ export default {
<template> <template>
<div <div
class="flex" class="flex"
:class="{ 'issue-info-container': !canReorder }" :class="{
'issue-info-container': !canReorder,
'card-body': canReorder,
}"
> >
<div class="block-truncated append-right-10"> <div class="block-truncated append-right-10">
<a <a
......
...@@ -93,10 +93,13 @@ export default { ...@@ -93,10 +93,13 @@ export default {
}, },
mounted() { mounted() {
if (this.canReorder) { if (this.canReorder) {
this.sortable = Sortable.create(this.$refs.list, Object.assign({}, sortableConfig, { this.sortable = Sortable.create(
onStart: this.addDraggingCursor, this.$refs.list,
onEnd: this.reordered, Object.assign({}, sortableConfig, {
})); onStart: this.addDraggingCursor,
onEnd: this.reordered,
}),
);
} }
}, },
methods: { methods: {
...@@ -225,7 +228,7 @@ issue-count-badge-add-button btn btn-sm btn-default" ...@@ -225,7 +228,7 @@ issue-count-badge-add-button btn btn-sm btn-default"
:class="{ :class="{
'user-can-drag': canReorder, 'user-can-drag': canReorder,
'sortable-row': canReorder, 'sortable-row': canReorder,
card: canReorder 'card-slim': canReorder
}" }"
:data-key="issue.id" :data-key="issue.id"
:data-epic-issue-id="issue.epic_issue_id" :data-epic-issue-id="issue.epic_issue_id"
......
...@@ -82,7 +82,7 @@ describe('DropdownValueComponent', () => { ...@@ -82,7 +82,7 @@ describe('DropdownValueComponent', () => {
}); });
it('renders label element with tooltip and styles based on label details', () => { it('renders label element with tooltip and styles based on label details', () => {
const labelEl = vm.$el.querySelector('a span.label.color-label'); const labelEl = vm.$el.querySelector('a span.badge.color-label');
expect(labelEl).not.toBeNull(); expect(labelEl).not.toBeNull();
expect(labelEl.dataset.placement).toBe('bottom'); expect(labelEl.dataset.placement).toBe('bottom');
expect(labelEl.dataset.container).toBe('body'); expect(labelEl.dataset.container).toBe('body');
......
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