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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
bc7dbfdc
Commit
bc7dbfdc
authored
Jun 04, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport of Resolve "Epics Page Styling is broken"
parent
5a855b28
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue
...hared/components/sidebar/labels_select/dropdown_value.vue
+7
-2
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 @
bc7dbfdc
...
@@ -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)"
...
...
spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_spec.js
View file @
bc7dbfdc
...
@@ -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
'
);
...
...
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