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
295fcdf3
Commit
295fcdf3
authored
Oct 13, 2020
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Project settings: Replace fa-chevron-down with SVG
parent
c2957bce
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
8 deletions
+26
-8
app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue
...shared/permissions/components/project_feature_setting.vue
+7
-5
app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
...projects/shared/permissions/components/settings_panel.vue
+14
-3
changelogs/unreleased/mw-project-settings-icon-replacements.yml
...logs/unreleased/mw-project-settings-icon-replacements.yml
+5
-0
No files found.
app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue
View file @
295fcdf3
<
script
>
import
{
GlIcon
}
from
'
@gitlab/ui
'
;
import
projectFeatureToggle
from
'
~/vue_shared/components/toggle_button.vue
'
;
import
{
featureAccessLevelNone
}
from
'
../constants
'
;
export
default
{
components
:
{
GlIcon
,
projectFeatureToggle
,
},
model
:
{
prop
:
'
value
'
,
event
:
'
change
'
,
},
props
:
{
name
:
{
type
:
String
,
...
...
@@ -34,7 +34,6 @@ export default {
default
:
false
,
},
},
computed
:
{
featureEnabled
()
{
return
this
.
value
!==
0
;
...
...
@@ -51,7 +50,6 @@ export default {
return
this
.
disabledInput
||
!
this
.
featureEnabled
||
this
.
displayOptions
.
length
<
2
;
},
},
methods
:
{
toggleFeature
(
featureEnabled
)
{
if
(
featureEnabled
===
false
||
this
.
options
.
length
<
1
)
{
...
...
@@ -96,7 +94,11 @@ export default {
{{
optionName
}}
</option>
</select>
<i
aria-hidden=
"true"
class=
"fa fa-chevron-down"
>
</i>
<gl-icon
name=
"chevron-down"
aria-hidden=
"true"
class=
"gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
/>
</div>
</div>
</
template
>
app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
View file @
295fcdf3
<
script
>
import
{
GlSprintf
,
GlLink
,
GlFormCheckbox
}
from
'
@gitlab/ui
'
;
import
{
Gl
Icon
,
Gl
Sprintf
,
GlLink
,
GlFormCheckbox
}
from
'
@gitlab/ui
'
;
import
settingsMixin
from
'
ee_else_ce/pages/projects/shared/permissions/mixins/settings_pannel_mixin
'
;
import
{
s__
}
from
'
~/locale
'
;
...
...
@@ -22,6 +22,7 @@ export default {
projectFeatureSetting
,
projectFeatureToggle
,
projectSettingRow
,
GlIcon
,
GlSprintf
,
GlLink
,
GlFormCheckbox
,
...
...
@@ -325,7 +326,12 @@ export default {
>
{{
s__
(
'
ProjectSettings|Public
'
)
}}
</option
>
</select>
<i
aria-hidden=
"true"
data-hidden=
"true"
class=
"fa fa-chevron-down"
></i>
<gl-icon
name=
"chevron-down"
aria-hidden=
"true"
data-hidden=
"true"
class=
"gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
/>
</div>
</div>
<span
class=
"form-text text-muted"
>
{{
visibilityLevelDescription
}}
</span>
...
...
@@ -540,7 +546,12 @@ export default {
>
{{ featureAccessLevelEveryone[1] }}
</option
>
</select>
<i
aria-hidden=
"true"
data-hidden=
"true"
class=
"fa fa-chevron-down"
></i>
<gl-icon
name=
"chevron-down"
aria-hidden=
"true"
data-hidden=
"true"
class=
"gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
/>
</div>
</div>
</project-setting-row>
...
...
changelogs/unreleased/mw-project-settings-icon-replacements.yml
0 → 100644
View file @
295fcdf3
---
title
:
Replace fa-chevron-down with GitLab SVG in project visibility settings
merge_request
:
45021
author
:
type
:
changed
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