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
f379f4ad
Commit
f379f4ad
authored
May 04, 2020
by
Denys Mishunov
Committed by
Enrique Alcántara
May 04, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix alignment of snippet clone copy btns
It sets the correct display form to the button components
parent
64ac09be
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
24 deletions
+17
-24
app/assets/javascripts/vue_shared/components/clone_dropdown.vue
...sets/javascripts/vue_shared/components/clone_dropdown.vue
+6
-8
changelogs/unreleased/216035-clone-dropdown-icons-alignment.yml
...logs/unreleased/216035-clone-dropdown-icons-alignment.yml
+5
-0
spec/frontend/vue_shared/components/__snapshots__/clone_dropdown_spec.js.snap
...ared/components/__snapshots__/clone_dropdown_spec.js.snap
+6
-16
No files found.
app/assets/javascripts/vue_shared/components/clone_dropdown.vue
View file @
f379f4ad
...
@@ -4,7 +4,6 @@ import {
...
@@ -4,7 +4,6 @@ import {
GlNewDropdownHeader
,
GlNewDropdownHeader
,
GlFormInputGroup
,
GlFormInputGroup
,
GlButton
,
GlButton
,
GlIcon
,
GlTooltipDirective
,
GlTooltipDirective
,
}
from
'
@gitlab/ui
'
;
}
from
'
@gitlab/ui
'
;
import
{
__
,
sprintf
}
from
'
~/locale
'
;
import
{
__
,
sprintf
}
from
'
~/locale
'
;
...
@@ -16,7 +15,6 @@ export default {
...
@@ -16,7 +15,6 @@ export default {
GlNewDropdownHeader
,
GlNewDropdownHeader
,
GlFormInputGroup
,
GlFormInputGroup
,
GlButton
,
GlButton
,
GlIcon
,
},
},
directives
:
{
directives
:
{
GlTooltip
:
GlTooltipDirective
,
GlTooltip
:
GlTooltipDirective
,
...
@@ -59,9 +57,9 @@ export default {
...
@@ -59,9 +57,9 @@ export default {
v-gl-tooltip
.
hover
v-gl-tooltip
.
hover
:title=
"$options.copyURLTooltip"
:title=
"$options.copyURLTooltip"
:data-clipboard-text=
"sshLink"
:data-clipboard-text=
"sshLink"
>
icon=
"copy-to-clipboard"
<gl-icon
name=
"copy-to-clipboard"
:title=
"$options.copyURLTooltip"
/>
class=
"d-inline-flex"
</gl-button
>
/
>
</
template
>
</
template
>
</gl-form-input-group>
</gl-form-input-group>
</div>
</div>
...
@@ -77,9 +75,9 @@ export default {
...
@@ -77,9 +75,9 @@ export default {
v-gl-tooltip
.
hover
v-gl-tooltip
.
hover
:title=
"$options.copyURLTooltip"
:title=
"$options.copyURLTooltip"
:data-clipboard-text=
"httpLink"
:data-clipboard-text=
"httpLink"
>
icon=
"copy-to-clipboard"
<gl-icon
name=
"copy-to-clipboard"
:title=
"$options.copyURLTooltip"
/>
class=
"d-inline-flex"
</gl-button
>
/
>
</
template
>
</
template
>
</gl-form-input-group>
</gl-form-input-group>
</div>
</div>
...
...
changelogs/unreleased/216035-clone-dropdown-icons-alignment.yml
0 → 100644
View file @
f379f4ad
---
title
:
Fixed alignment of Snippet Clone copy buttons
merge_request
:
30897
author
:
type
:
fixed
spec/frontend/vue_shared/components/__snapshots__/clone_dropdown_spec.js.snap
View file @
f379f4ad
...
@@ -44,18 +44,13 @@ exports[`Clone Dropdown Button rendering matches the snapshot 1`] = `
...
@@ -44,18 +44,13 @@ exports[`Clone Dropdown Button rendering matches the snapshot 1`] = `
>
>
<gl-button-stub
<gl-button-stub
category="tertiary"
category="tertiary"
class="d-inline-flex"
data-clipboard-text="ssh://foo.bar"
data-clipboard-text="ssh://foo.bar"
icon=""
icon="
copy-to-clipboard
"
size="medium"
size="medium"
title="Copy URL"
title="Copy URL"
variant="default"
variant="default"
>
/>
<gl-icon-stub
name="copy-to-clipboard"
size="16"
title="Copy URL"
/>
</gl-button-stub>
</b-input-group-append-stub>
</b-input-group-append-stub>
</b-input-group-stub>
</b-input-group-stub>
</div>
</div>
...
@@ -94,18 +89,13 @@ exports[`Clone Dropdown Button rendering matches the snapshot 1`] = `
...
@@ -94,18 +89,13 @@ exports[`Clone Dropdown Button rendering matches the snapshot 1`] = `
>
>
<gl-button-stub
<gl-button-stub
category="tertiary"
category="tertiary"
class="d-inline-flex"
data-clipboard-text="http://foo.bar"
data-clipboard-text="http://foo.bar"
icon=""
icon="
copy-to-clipboard
"
size="medium"
size="medium"
title="Copy URL"
title="Copy URL"
variant="default"
variant="default"
>
/>
<gl-icon-stub
name="copy-to-clipboard"
size="16"
title="Copy URL"
/>
</gl-button-stub>
</b-input-group-append-stub>
</b-input-group-append-stub>
</b-input-group-stub>
</b-input-group-stub>
</div>
</div>
...
...
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