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
1c5f4790
Commit
1c5f4790
authored
Sep 22, 2020
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-chevron-down with GitLab SVG
parent
1def732d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
6 deletions
+19
-6
changelogs/unreleased/mw-feature-flags-replace-chevron-fa-icon.yml
...s/unreleased/mw-feature-flags-replace-chevron-fa-icon.yml
+5
-0
ee/app/assets/javascripts/feature_flags/components/form.vue
ee/app/assets/javascripts/feature_flags/components/form.vue
+14
-6
No files found.
changelogs/unreleased/mw-feature-flags-replace-chevron-fa-icon.yml
0 → 100644
View file @
1c5f4790
---
title
:
'
Feature
flags
form:
Replace
fa-chevron-down
with
GitLab
SVG'
merge_request
:
42968
author
:
type
:
changed
ee/app/assets/javascripts/feature_flags/components/form.vue
View file @
1c5f4790
...
...
@@ -9,6 +9,7 @@ import {
GlFormTextarea
,
GlFormCheckbox
,
GlSprintf
,
GlIcon
,
}
from
'
@gitlab/ui
'
;
import
Api
from
'
ee/api
'
;
import
RelatedIssuesRoot
from
'
~/related_issues/components/related_issues_root.vue
'
;
...
...
@@ -37,6 +38,7 @@ export default {
GlFormCheckbox
,
GlTooltip
,
GlSprintf
,
GlIcon
,
ToggleButton
,
EnvironmentsDropdown
,
Strategy
,
...
...
@@ -461,7 +463,11 @@ export default {
{{ s__('FeatureFlags|User IDs') }}
</option>
</select>
<i
aria-hidden=
"true"
data-hidden=
"true"
class=
"fa fa-chevron-down"
></i>
<gl-icon
name=
"chevron-down"
class=
"gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
:size=
"16"
/>
</div>
<div
...
...
@@ -500,9 +506,8 @@ export default {
<gl-form-checkbox
v-if=
"shouldDisplayIncludeUserIds(scope)"
v-model=
"scope.shouldIncludeUserIds"
>
{{ s__('FeatureFlags|Include additional user IDs') }}
</gl-form-checkbox
>
{{ s__('FeatureFlags|Include additional user IDs') }}
</gl-form-checkbox>
<
template
v-if=
"shouldDisplayUserIds(scope)"
>
<label
:for=
"rolloutUserId(index)"
class=
"mb-2"
>
{{
s__
(
'
FeatureFlags|User IDs
'
)
}}
...
...
@@ -579,7 +584,11 @@ export default {
>
<option>
{{ s__('FeatureFlags|All users') }}
</option>
</select>
<i
aria-hidden=
"true"
data-hidden=
"true"
class=
"fa fa-chevron-down"
></i>
<gl-icon
name=
"chevron-down"
class=
"gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
:size=
"16"
/>
</div>
</div>
</div>
...
...
@@ -597,9 +606,8 @@ export default {
variant=
"success"
class=
"js-ff-submit col-xs-12"
@
click=
"handleSubmit"
>
{{ submitText }}
</gl-button
>
{{ submitText }}
</gl-button>
<gl-button
:href=
"cancelPath"
class=
"js-ff-cancel col-xs-12 float-right"
>
{{ __('Cancel') }}
</gl-button>
...
...
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