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
4646e08a
Commit
4646e08a
authored
Sep 10, 2020
by
Christie Lenneville
Committed by
Vitaly Slobodin
Sep 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update create label modal to gl-buttons
parent
1dd797d7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
19 deletions
+17
-19
app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue
...omponents/sidebar/labels_select/dropdown_create_label.vue
+15
-12
spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_create_label_spec.js
...nents/sidebar/labels_select/dropdown_create_label_spec.js
+2
-7
No files found.
app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue
View file @
4646e08a
...
...
@@ -28,21 +28,24 @@ export default {
<
template
>
<div
class=
"dropdown-page-two dropdown-new-label"
>
<div
class=
"dropdown-title"
>
<div
class=
"dropdown-title gl-display-flex gl-justify-content-space-between gl-align-items-center"
>
<gl-button
:aria-label=
"__('Go back')"
category=
"tertiary"
class=
"dropdown-
title-button dropdown-
menu-back"
class=
"dropdown-menu-back"
icon=
"arrow-left"
size=
"small"
/>
{{
headerTitle
}}
<button
<
gl-
button
:aria-label=
"__('Close')"
type=
"button
"
class=
"dropdown-
title-button dropdown-
menu-close"
>
<i
aria-hidden=
"true"
class=
"fa fa-times dropdown-menu-close-icon"
data-hidden=
"true"
>
</i>
</button
>
category=
"tertiary
"
class=
"dropdown-menu-close"
icon=
"close"
size=
"small"
/
>
</div>
<div
class=
"dropdown-content"
>
<div
class=
"dropdown-labels-error js-label-error"
></div>
...
...
@@ -77,12 +80,12 @@ export default {
/>
</div>
<div
class=
"clearfix"
>
<
button
type=
"button"
class=
"btn btn-primary
float-left js-new-label-btn disabled"
>
<
gl-button
category=
"secondary"
class=
"
float-left js-new-label-btn disabled"
>
{{
__
(
'
Create
'
)
}}
</button>
<
button
type=
"button"
class=
"btn btn-default
float-right js-cancel-label-btn"
>
</
gl-
button>
<
gl-button
category=
"secondary"
class=
"
float-right js-cancel-label-btn"
>
{{
__
(
'
Cancel
'
)
}}
</button>
</
gl-
button>
</div>
</div>
</div>
...
...
spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_create_label_spec.js
View file @
4646e08a
...
...
@@ -38,9 +38,7 @@ describe('DropdownCreateLabelComponent', () => {
});
it
(
'
renders `Go back` button on component header
'
,
()
=>
{
const
backButtonEl
=
vm
.
$el
.
querySelector
(
'
.dropdown-title button.dropdown-title-button.dropdown-menu-back
'
,
);
const
backButtonEl
=
vm
.
$el
.
querySelector
(
'
.dropdown-title .dropdown-menu-back
'
);
expect
(
backButtonEl
).
not
.
toBe
(
null
);
expect
(
backButtonEl
.
querySelector
(
'
[data-testid="arrow-left-icon"]
'
)).
not
.
toBe
(
null
);
...
...
@@ -62,12 +60,9 @@ describe('DropdownCreateLabelComponent', () => {
});
it
(
'
renders `Close` button on component header
'
,
()
=>
{
const
closeButtonEl
=
vm
.
$el
.
querySelector
(
'
.dropdown-title button.dropdown-title-button.dropdown-menu-close
'
,
);
const
closeButtonEl
=
vm
.
$el
.
querySelector
(
'
.dropdown-title .dropdown-menu-close
'
);
expect
(
closeButtonEl
).
not
.
toBe
(
null
);
expect
(
closeButtonEl
.
querySelector
(
'
.fa-times.dropdown-menu-close-icon
'
)).
not
.
toBe
(
null
);
});
it
(
'
renders `Name new label` input element
'
,
()
=>
{
...
...
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