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
f7ac8479
Commit
f7ac8479
authored
Nov 16, 2020
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-chevron-down in dropdown button
parent
f0b673bc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue
...cripts/vue_shared/components/dropdown/dropdown_button.vue
+7
-4
changelogs/unreleased/mw-replace-fa-chevron-down-dropdown-button.yml
...unreleased/mw-replace-fa-chevron-down-dropdown-button.yml
+5
-0
spec/frontend/vue_shared/components/dropdown/dropdown_button_spec.js
...nd/vue_shared/components/dropdown/dropdown_button_spec.js
+1
-2
No files found.
app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue
View file @
f7ac8479
<
script
>
<
script
>
import
{
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlLoadingIcon
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
export
default
{
export
default
{
components
:
{
components
:
{
GlLoadingIcon
,
GlLoadingIcon
,
GlIcon
,
},
},
props
:
{
props
:
{
isDisabled
:
{
isDisabled
:
{
...
@@ -39,8 +40,10 @@ export default {
...
@@ -39,8 +40,10 @@ export default {
<slot
v-if=
"$slots.default"
></slot>
<slot
v-if=
"$slots.default"
></slot>
<span
v-else
class=
"dropdown-toggle-text"
>
{{
toggleText
}}
</span>
<span
v-else
class=
"dropdown-toggle-text"
>
{{
toggleText
}}
</span>
</
template
>
</
template
>
<span
v-show=
"!isLoading"
class=
"dropdown-toggle-icon"
>
<gl-icon
<i
class=
"fa fa-chevron-down"
aria-hidden=
"true"
data-hidden=
"true"
></i>
v-show=
"!isLoading"
</span>
class=
"gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
name=
"chevron-down"
/>
</button>
</button>
</template>
</template>
changelogs/unreleased/mw-replace-fa-chevron-down-dropdown-button.yml
0 → 100644
View file @
f7ac8479
---
title
:
Replace fa-chevron-down in dropdown button
merge_request
:
47758
author
:
type
:
changed
spec/frontend/vue_shared/components/dropdown/dropdown_button_spec.js
View file @
f7ac8479
...
@@ -60,10 +60,9 @@ describe('DropdownButtonComponent', () => {
...
@@ -60,10 +60,9 @@ describe('DropdownButtonComponent', () => {
});
});
it
(
'
renders dropdown button icon
'
,
()
=>
{
it
(
'
renders dropdown button icon
'
,
()
=>
{
const
dropdownIconEl
=
vm
.
$el
.
querySelector
(
'
.dropdown-toggle-icon i.fa
'
);
const
dropdownIconEl
=
vm
.
$el
.
querySelector
(
'
[data-testid="chevron-down-icon"]
'
);
expect
(
dropdownIconEl
).
not
.
toBeNull
();
expect
(
dropdownIconEl
).
not
.
toBeNull
();
expect
(
dropdownIconEl
.
classList
.
contains
(
'
fa-chevron-down
'
)).
toBe
(
true
);
});
});
it
(
'
renders slot, if default slot exists
'
,
()
=>
{
it
(
'
renders slot, if default slot exists
'
,
()
=>
{
...
...
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