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
7ca340fa
Commit
7ca340fa
authored
Feb 06, 2020
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'arrows-to-chevrons' into 'master'
Arrows to chevrons See merge request gitlab-org/gitlab!24570
parents
40a939a6
d911cf66
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
16 additions
and
16 deletions
+16
-16
app/assets/javascripts/diffs/components/settings_dropdown.vue
...assets/javascripts/diffs/components/settings_dropdown.vue
+1
-1
app/assets/javascripts/ide/components/new_dropdown/index.vue
app/assets/javascripts/ide/components/new_dropdown/index.vue
+1
-1
app/assets/javascripts/releases/list/components/release_block_assets.vue
...scripts/releases/list/components/release_block_assets.vue
+1
-1
app/assets/javascripts/repository/components/breadcrumbs.vue
app/assets/javascripts/repository/components/breadcrumbs.vue
+1
-1
app/assets/javascripts/vue_shared/components/droplab_dropdown_button.vue
...scripts/vue_shared/components/droplab_dropdown_button.vue
+1
-1
app/views/groups/_home_panel.html.haml
app/views/groups/_home_panel.html.haml
+1
-1
app/views/projects/buttons/_clone.html.haml
app/views/projects/buttons/_clone.html.haml
+1
-1
app/views/projects/buttons/_download.html.haml
app/views/projects/buttons/_download.html.haml
+1
-1
app/views/projects/compare/_form.html.haml
app/views/projects/compare/_form.html.haml
+2
-2
app/views/projects/tree/_tree_header.html.haml
app/views/projects/tree/_tree_header.html.haml
+1
-1
app/views/shared/_mobile_clone_panel.html.haml
app/views/shared/_mobile_clone_panel.html.haml
+1
-1
app/views/shared/notifications/_new_button.html.haml
app/views/shared/notifications/_new_button.html.haml
+2
-2
ee/app/assets/javascripts/dependencies/components/dependencies_table_row.vue
...cripts/dependencies/components/dependencies_table_row.vue
+1
-1
ee/spec/frontend/dependencies/components/__snapshots__/dependencies_table_row_spec.js.snap
...ponents/__snapshots__/dependencies_table_row_spec.js.snap
+1
-1
No files found.
app/assets/javascripts/diffs/components/settings_dropdown.vue
View file @
7ca340fa
...
@@ -31,7 +31,7 @@ export default {
...
@@ -31,7 +31,7 @@ export default {
data-toggle=
"dropdown"
data-toggle=
"dropdown"
data-display=
"static"
data-display=
"static"
>
>
<icon
name=
"settings"
/>
<icon
name=
"
arrow
-down"
/>
<icon
name=
"settings"
/>
<icon
name=
"
chevron
-down"
/>
</button>
</button>
<div
class=
"dropdown-menu dropdown-menu-right p-2 pt-3 pb-3"
>
<div
class=
"dropdown-menu dropdown-menu-right p-2 pt-3 pb-3"
>
<div>
<div>
...
...
app/assets/javascripts/ide/components/new_dropdown/index.vue
View file @
7ca340fa
...
@@ -64,7 +64,7 @@ export default {
...
@@ -64,7 +64,7 @@ export default {
class=
"rounded border-0 d-flex ide-entry-dropdown-toggle"
class=
"rounded border-0 d-flex ide-entry-dropdown-toggle"
@
click.stop=
"openDropdown()"
@
click.stop=
"openDropdown()"
>
>
<icon
name=
"ellipsis_v"
/>
<icon
name=
"
arrow
-down"
/>
<icon
name=
"ellipsis_v"
/>
<icon
name=
"
chevron
-down"
/>
</button>
</button>
<ul
ref=
"dropdownMenu"
class=
"dropdown-menu dropdown-menu-right"
>
<ul
ref=
"dropdownMenu"
class=
"dropdown-menu dropdown-menu-right"
>
<template
v-if=
"type === 'tree'"
>
<template
v-if=
"type === 'tree'"
>
...
...
app/assets/javascripts/releases/list/components/release_block_assets.vue
View file @
7ca340fa
...
@@ -52,7 +52,7 @@ export default {
...
@@ -52,7 +52,7 @@ export default {
>
>
<icon
name=
"doc-code"
class=
"align-top append-right-4"
/>
<icon
name=
"doc-code"
class=
"align-top append-right-4"
/>
{{
__
(
'
Source code
'
)
}}
{{
__
(
'
Source code
'
)
}}
<icon
name=
"
arrow
-down"
/>
<icon
name=
"
chevron
-down"
/>
</button>
</button>
<div
class=
"js-sources-dropdown dropdown-menu"
>
<div
class=
"js-sources-dropdown dropdown-menu"
>
...
...
app/assets/javascripts/repository/components/breadcrumbs.vue
View file @
7ca340fa
...
@@ -242,7 +242,7 @@ export default {
...
@@ -242,7 +242,7 @@ export default {
<template
slot=
"button-content"
>
<template
slot=
"button-content"
>
<span
class=
"sr-only"
>
{{
__
(
'
Add to tree
'
)
}}
</span>
<span
class=
"sr-only"
>
{{
__
(
'
Add to tree
'
)
}}
</span>
<icon
name=
"plus"
:size=
"16"
class=
"float-left"
/>
<icon
name=
"plus"
:size=
"16"
class=
"float-left"
/>
<icon
name=
"
arrow
-down"
:size=
"16"
class=
"float-left"
/>
<icon
name=
"
chevron
-down"
:size=
"16"
class=
"float-left"
/>
</
template
>
</
template
>
<
template
v-for=
"(item, i) in dropdownItems"
>
<
template
v-for=
"(item, i) in dropdownItems"
>
<component
:is=
"getComponent(item.type)"
:key=
"i"
v-bind=
"item.attrs"
>
<component
:is=
"getComponent(item.type)"
:key=
"i"
v-bind=
"item.attrs"
>
...
...
app/assets/javascripts/vue_shared/components/droplab_dropdown_button.vue
View file @
7ca340fa
...
@@ -69,7 +69,7 @@ export default {
...
@@ -69,7 +69,7 @@ export default {
data-display=
"static"
data-display=
"static"
data-toggle=
"dropdown"
data-toggle=
"dropdown"
>
>
<icon
name=
"
arrow
-down"
:aria-label=
"__('toggle dropdown')"
/>
<icon
name=
"
chevron
-down"
:aria-label=
"__('toggle dropdown')"
/>
</button>
</button>
<ul
:class=
"dropdownClass"
class=
"dropdown-menu dropdown-open-top"
>
<ul
:class=
"dropdownClass"
class=
"dropdown-menu dropdown-open-top"
>
<template
v-for=
"(action, index) in actions"
>
<template
v-for=
"(action, index) in actions"
>
...
...
app/views/groups/_home_panel.html.haml
View file @
7ca340fa
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
.btn-group.new-project-subgroup.droplab-dropdown.home-panel-action-button.prepend-top-default.js-new-project-subgroup.qa-new-project-or-subgroup-dropdown
{
data:
{
project_path:
new_project_path
(
namespace_id:
@group
.
id
),
subgroup_path:
new_group_path
(
parent_id:
@group
.
id
)
}
}
.btn-group.new-project-subgroup.droplab-dropdown.home-panel-action-button.prepend-top-default.js-new-project-subgroup.qa-new-project-or-subgroup-dropdown
{
data:
{
project_path:
new_project_path
(
namespace_id:
@group
.
id
),
subgroup_path:
new_group_path
(
parent_id:
@group
.
id
)
}
}
%input
.btn.btn-success.dropdown-primary.js-new-group-child.qa-new-in-group-button
{
type:
"button"
,
value:
new_project_label
,
data:
{
action:
"new-project"
}
}
%input
.btn.btn-success.dropdown-primary.js-new-group-child.qa-new-in-group-button
{
type:
"button"
,
value:
new_project_label
,
data:
{
action:
"new-project"
}
}
%button
.btn.btn-success.dropdown-toggle.js-dropdown-toggle.qa-new-project-or-subgroup-dropdown-toggle
{
type:
"button"
,
data:
{
"dropdown-trigger"
=>
"#new-project-or-subgroup-dropdown"
,
'display'
=>
'static'
}
}
%button
.btn.btn-success.dropdown-toggle.js-dropdown-toggle.qa-new-project-or-subgroup-dropdown-toggle
{
type:
"button"
,
data:
{
"dropdown-trigger"
=>
"#new-project-or-subgroup-dropdown"
,
'display'
=>
'static'
}
}
=
sprite_icon
(
"
arrow
-down"
,
css_class:
"icon dropdown-btn-icon"
)
=
sprite_icon
(
"
chevron
-down"
,
css_class:
"icon dropdown-btn-icon"
)
%ul
#new-project-or-subgroup-dropdown
.dropdown-menu.dropdown-menu-right
{
data:
{
dropdown:
true
}
}
%ul
#new-project-or-subgroup-dropdown
.dropdown-menu.dropdown-menu-right
{
data:
{
dropdown:
true
}
}
%li
.droplab-item-selected.qa-new-project-option
{
role:
"button"
,
data:
{
value:
"new-project"
,
text:
new_project_label
}
}
%li
.droplab-item-selected.qa-new-project-option
{
role:
"button"
,
data:
{
value:
"new-project"
,
text:
new_project_label
}
}
.menu-item
.menu-item
...
...
app/views/projects/buttons/_clone.html.haml
View file @
7ca340fa
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
%a
#clone-dropdown
.btn.btn-primary.clone-dropdown-btn.qa-clone-dropdown
{
href:
'#'
,
data:
{
toggle:
'dropdown'
}
}
%a
#clone-dropdown
.btn.btn-primary.clone-dropdown-btn.qa-clone-dropdown
{
href:
'#'
,
data:
{
toggle:
'dropdown'
}
}
%span
.append-right-4.js-clone-dropdown-label
%span
.append-right-4.js-clone-dropdown-label
=
_
(
'Clone'
)
=
_
(
'Clone'
)
=
sprite_icon
(
"
arrow
-down"
,
css_class:
"icon"
)
=
sprite_icon
(
"
chevron
-down"
,
css_class:
"icon"
)
%ul
.p-3.dropdown-menu.dropdown-menu-large.dropdown-menu-selectable.clone-options-dropdown.qa-clone-options
{
class:
dropdown_class
}
%ul
.p-3.dropdown-menu.dropdown-menu-large.dropdown-menu-selectable.clone-options-dropdown.qa-clone-options
{
class:
dropdown_class
}
-
if
ssh_enabled?
-
if
ssh_enabled?
%li
%li
...
...
app/views/projects/buttons/_download.html.haml
View file @
7ca340fa
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
%button
.btn.has-tooltip
{
title:
s_
(
'DownloadSource|Download'
),
'data-toggle'
=>
'dropdown'
,
'aria-label'
=>
s_
(
'DownloadSource|Download'
),
'data-display'
=>
'static'
,
data:
{
qa_selector:
'download_source_code_button'
}
}
%button
.btn.has-tooltip
{
title:
s_
(
'DownloadSource|Download'
),
'data-toggle'
=>
'dropdown'
,
'aria-label'
=>
s_
(
'DownloadSource|Download'
),
'data-display'
=>
'static'
,
data:
{
qa_selector:
'download_source_code_button'
}
}
=
sprite_icon
(
'download'
)
=
sprite_icon
(
'download'
)
%span
.sr-only
=
_
(
'Select Archive Format'
)
%span
.sr-only
=
_
(
'Select Archive Format'
)
=
sprite_icon
(
"
arrow
-down"
)
=
sprite_icon
(
"
chevron
-down"
)
.dropdown-menu.dropdown-menu-right
{
role:
'menu'
}
.dropdown-menu.dropdown-menu-right
{
role:
'menu'
}
%section
%section
%h5
.m-0.dropdown-bold-header
=
_
(
'Download source code'
)
%h5
.m-0.dropdown-bold-header
=
_
(
'Download source code'
)
...
...
app/views/projects/compare/_form.html.haml
View file @
7ca340fa
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
=
hidden_field_tag
:to
,
params
[
:to
]
=
hidden_field_tag
:to
,
params
[
:to
]
=
button_tag
type:
'button'
,
title:
params
[
:to
],
class:
"btn form-control compare-dropdown-toggle js-compare-dropdown has-tooltip"
,
required:
true
,
data:
{
refs_url:
refs_project_path
(
@project
),
toggle:
"dropdown"
,
target:
".js-compare-to-dropdown"
,
selected:
params
[
:to
],
field_name: :to
}
do
=
button_tag
type:
'button'
,
title:
params
[
:to
],
class:
"btn form-control compare-dropdown-toggle js-compare-dropdown has-tooltip"
,
required:
true
,
data:
{
refs_url:
refs_project_path
(
@project
),
toggle:
"dropdown"
,
target:
".js-compare-to-dropdown"
,
selected:
params
[
:to
],
field_name: :to
}
do
.dropdown-toggle-text.str-truncated.monospace.float-left
=
params
[
:to
]
||
_
(
"Select branch/tag"
)
.dropdown-toggle-text.str-truncated.monospace.float-left
=
params
[
:to
]
||
_
(
"Select branch/tag"
)
=
sprite_icon
(
'
arrow
-down'
,
size:
16
,
css_class:
'float-right'
)
=
sprite_icon
(
'
chevron
-down'
,
size:
16
,
css_class:
'float-right'
)
=
render
'shared/ref_dropdown'
=
render
'shared/ref_dropdown'
.compare-ellipsis.inline
...
.compare-ellipsis.inline
...
.form-group.dropdown.compare-form-group.from.js-compare-from-dropdown
.form-group.dropdown.compare-form-group.from.js-compare-from-dropdown
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
=
hidden_field_tag
:from
,
params
[
:from
]
=
hidden_field_tag
:from
,
params
[
:from
]
=
button_tag
type:
'button'
,
title:
params
[
:from
],
class:
"btn form-control compare-dropdown-toggle js-compare-dropdown has-tooltip"
,
required:
true
,
data:
{
refs_url:
refs_project_path
(
@project
),
toggle:
"dropdown"
,
target:
".js-compare-from-dropdown"
,
selected:
params
[
:from
],
field_name: :from
}
do
=
button_tag
type:
'button'
,
title:
params
[
:from
],
class:
"btn form-control compare-dropdown-toggle js-compare-dropdown has-tooltip"
,
required:
true
,
data:
{
refs_url:
refs_project_path
(
@project
),
toggle:
"dropdown"
,
target:
".js-compare-from-dropdown"
,
selected:
params
[
:from
],
field_name: :from
}
do
.dropdown-toggle-text.str-truncated.monospace.float-left
=
params
[
:from
]
||
_
(
"Select branch/tag"
)
.dropdown-toggle-text.str-truncated.monospace.float-left
=
params
[
:from
]
||
_
(
"Select branch/tag"
)
=
sprite_icon
(
'
arrow
-down'
,
size:
16
,
css_class:
'float-right'
)
=
sprite_icon
(
'
chevron
-down'
,
size:
16
,
css_class:
'float-right'
)
=
render
'shared/ref_dropdown'
=
render
'shared/ref_dropdown'
=
button_tag
s_
(
"CompareBranches|Compare"
),
class:
"btn btn-success commits-compare-btn"
=
button_tag
s_
(
"CompareBranches|Compare"
),
class:
"btn btn-success commits-compare-btn"
...
...
app/views/projects/tree/_tree_header.html.haml
View file @
7ca340fa
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
%li
.breadcrumb-item
%li
.breadcrumb-item
%button
.btn.add-to-tree.qa-add-to-tree
{
addtotree_toggle_attributes
,
type:
'button'
}
%button
.btn.add-to-tree.qa-add-to-tree
{
addtotree_toggle_attributes
,
type:
'button'
}
=
sprite_icon
(
'plus'
,
size:
16
,
css_class:
'float-left'
)
=
sprite_icon
(
'plus'
,
size:
16
,
css_class:
'float-left'
)
=
sprite_icon
(
'
arrow
-down'
,
size:
16
,
css_class:
'float-left'
)
=
sprite_icon
(
'
chevron
-down'
,
size:
16
,
css_class:
'float-left'
)
-
if
on_top_of_branch?
-
if
on_top_of_branch?
.add-to-tree-dropdown
.add-to-tree-dropdown
%ul
.dropdown-menu
%ul
.dropdown-menu
...
...
app/views/shared/_mobile_clone_panel.html.haml
View file @
7ca340fa
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
.btn-group.mobile-git-clone.js-mobile-git-clone.btn-block
.btn-group.mobile-git-clone.js-mobile-git-clone.btn-block
=
clipboard_button
(
button_text:
default_clone_label
,
text:
default_url_to_repo
(
project
),
hide_button_icon:
true
,
class:
"btn-primary flex-fill bold justify-content-center input-group-text clone-dropdown-btn js-clone-dropdown-label"
)
=
clipboard_button
(
button_text:
default_clone_label
,
text:
default_url_to_repo
(
project
),
hide_button_icon:
true
,
class:
"btn-primary flex-fill bold justify-content-center input-group-text clone-dropdown-btn js-clone-dropdown-label"
)
%button
.btn.btn-primary.dropdown-toggle.js-dropdown-toggle.flex-grow-0.d-flex-center.w-auto.ml-0
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
%button
.btn.btn-primary.dropdown-toggle.js-dropdown-toggle.flex-grow-0.d-flex-center.w-auto.ml-0
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
=
sprite_icon
(
"
arrow
-down"
,
css_class:
"dropdown-btn-icon icon"
)
=
sprite_icon
(
"
chevron
-down"
,
css_class:
"dropdown-btn-icon icon"
)
%ul
.dropdown-menu.dropdown-menu-selectable.dropdown-menu-right.clone-options-dropdown
{
data:
{
dropdown:
true
}
}
%ul
.dropdown-menu.dropdown-menu-selectable.dropdown-menu-right.clone-options-dropdown
{
data:
{
dropdown:
true
}
}
-
if
ssh_enabled?
-
if
ssh_enabled?
%li
%li
...
...
app/views/shared/notifications/_new_button.html.haml
View file @
7ca340fa
...
@@ -20,13 +20,13 @@
...
@@ -20,13 +20,13 @@
=
notification_setting_icon
(
notification_setting
)
=
notification_setting_icon
(
notification_setting
)
%span
.js-notification-loading.fa.hidden
%span
.js-notification-loading.fa.hidden
%button
.btn.dropdown-toggle
{
data:
{
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
},
class:
"#{btn_class}"
}
%button
.btn.dropdown-toggle
{
data:
{
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
},
class:
"#{btn_class}"
}
=
sprite_icon
(
"
arrow
-down"
,
css_class:
"icon mr-0"
)
=
sprite_icon
(
"
chevron
-down"
,
css_class:
"icon mr-0"
)
.sr-only
Toggle dropdown
.sr-only
Toggle dropdown
-
else
-
else
%button
.dropdown-new.btn.btn-default.has-tooltip.notifications-btn
#notifications-button
{
type:
"button"
,
title:
button_title
,
class:
"#{btn_class}"
,
"aria-label"
=>
button_title
,
data:
{
container:
"body"
,
placement:
'top'
,
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
}
%button
.dropdown-new.btn.btn-default.has-tooltip.notifications-btn
#notifications-button
{
type:
"button"
,
title:
button_title
,
class:
"#{btn_class}"
,
"aria-label"
=>
button_title
,
data:
{
container:
"body"
,
placement:
'top'
,
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
}
=
notification_setting_icon
(
notification_setting
)
=
notification_setting_icon
(
notification_setting
)
%span
.js-notification-loading.fa.hidden
%span
.js-notification-loading.fa.hidden
=
sprite_icon
(
"
arrow
-down"
,
css_class:
"icon"
)
=
sprite_icon
(
"
chevron
-down"
,
css_class:
"icon"
)
=
render
"shared/notifications/notification_dropdown"
,
notification_setting:
notification_setting
=
render
"shared/notifications/notification_dropdown"
,
notification_setting:
notification_setting
...
...
ee/app/assets/javascripts/dependencies/components/dependencies_table_row.vue
View file @
7ca340fa
...
@@ -33,7 +33,7 @@ export default {
...
@@ -33,7 +33,7 @@ export default {
},
},
computed
:
{
computed
:
{
toggleArrowName
()
{
toggleArrowName
()
{
return
this
.
isExpanded
?
'
arrow-up
'
:
'
arrow
-down
'
;
return
this
.
isExpanded
?
'
chevron-up
'
:
'
chevron
-down
'
;
},
},
vulnerabilities
()
{
vulnerabilities
()
{
const
{
vulnerabilities
=
[]
}
=
this
.
dependency
||
{};
const
{
vulnerabilities
=
[]
}
=
this
.
dependency
||
{};
...
...
ee/spec/frontend/dependencies/components/__snapshots__/dependencies_table_row_spec.js.snap
View file @
7ca340fa
...
@@ -160,7 +160,7 @@ exports[`DependenciesTableRow component when a dependency with vulnerabilities i
...
@@ -160,7 +160,7 @@ exports[`DependenciesTableRow component when a dependency with vulnerabilities i
>
>
<icon-stub
<icon-stub
class="align-top text-secondary-700 d-none d-md-inline"
class="align-top text-secondary-700 d-none d-md-inline"
name="
arrow
-down"
name="
chevron
-down"
size="16"
size="16"
/>
/>
...
...
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