Commit fb5358e0 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch '216035-clone-dropdown-icons-alignment' into 'master'

Fixed alignment of snippet clone copy btns

See merge request gitlab-org/gitlab!30897
parents c6c95d49 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>
......
---
title: Fixed alignment of Snippet Clone copy buttons
merge_request: 30897
author:
type: fixed
...@@ -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>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment