Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a0cb257c
Commit
a0cb257c
authored
6 years ago
by
Tim Zallmann
Committed by
Clement Ho
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Epics Page Styling is broken"
parent
d230ec46
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
9 deletions
+20
-9
app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue
...hared/components/sidebar/labels_select/dropdown_value.vue
+7
-2
ee/app/assets/javascripts/related_issues/components/issue_item.vue
...sets/javascripts/related_issues/components/issue_item.vue
+4
-1
ee/app/assets/javascripts/related_issues/components/related_issues_block.vue
...cripts/related_issues/components/related_issues_block.vue
+8
-5
spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_spec.js
...d/components/sidebar/labels_select/dropdown_value_spec.js
+1
-1
No files found.
app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue
View file @
a0cb257c
...
...
@@ -35,7 +35,12 @@ export default {
</
script
>
<
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
v-if=
"isEmpty"
class=
"text-secondary"
...
...
@@ -50,7 +55,7 @@ export default {
>
<span
v-tooltip
class=
"
label
color-label"
class=
"
badge
color-label"
data-placement=
"bottom"
data-container=
"body"
:style=
"labelStyle(label)"
...
...
This diff is collapsed.
Click to expand it.
ee/app/assets/javascripts/related_issues/components/issue_item.vue
View file @
a0cb257c
...
...
@@ -23,7 +23,10 @@ export default {
<
template
>
<div
class=
"flex"
:class=
"
{ 'issue-info-container': !canReorder }"
:class=
"
{
'issue-info-container': !canReorder,
'card-body': canReorder,
}"
>
<div
class=
"block-truncated append-right-10"
>
<a
...
...
This diff is collapsed.
Click to expand it.
ee/app/assets/javascripts/related_issues/components/related_issues_block.vue
View file @
a0cb257c
...
...
@@ -93,10 +93,13 @@ export default {
},
mounted
()
{
if
(
this
.
canReorder
)
{
this
.
sortable
=
Sortable
.
create
(
this
.
$refs
.
list
,
Object
.
assign
({},
sortableConfig
,
{
onStart
:
this
.
addDraggingCursor
,
onEnd
:
this
.
reordered
,
}));
this
.
sortable
=
Sortable
.
create
(
this
.
$refs
.
list
,
Object
.
assign
({},
sortableConfig
,
{
onStart
:
this
.
addDraggingCursor
,
onEnd
:
this
.
reordered
,
}),
);
}
},
methods
:
{
...
...
@@ -225,7 +228,7 @@ issue-count-badge-add-button btn btn-sm btn-default"
:class=
"
{
'user-can-drag': canReorder,
'sortable-row': canReorder,
card
: canReorder
'card-slim'
: canReorder
}"
:data-key="issue.id"
:data-epic-issue-id="issue.epic_issue_id"
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_spec.js
View file @
a0cb257c
...
...
@@ -82,7 +82,7 @@ describe('DropdownValueComponent', () => {
});
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
.
dataset
.
placement
).
toBe
(
'
bottom
'
);
expect
(
labelEl
.
dataset
.
container
).
toBe
(
'
body
'
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment