Commit 5ab59c82 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'update-external-link-icon-in-merge-request-widget' into 'master'

Update external link icon in merge request widget

See merge request gitlab-org/gitlab-ce!20154
parents 0e6757e8 b4267aaa
<script> <script>
import Icon from '~/vue_shared/components/icon.vue';
import timeagoMixin from '../../vue_shared/mixins/timeago'; import timeagoMixin from '../../vue_shared/mixins/timeago';
import tooltip from '../../vue_shared/directives/tooltip'; import tooltip from '../../vue_shared/directives/tooltip';
import LoadingButton from '../../vue_shared/components/loading_button.vue'; import LoadingButton from '../../vue_shared/components/loading_button.vue';
...@@ -14,6 +15,7 @@ export default { ...@@ -14,6 +15,7 @@ export default {
LoadingButton, LoadingButton,
MemoryUsage, MemoryUsage,
StatusIcon, StatusIcon,
Icon,
}, },
directives: { directives: {
tooltip, tooltip,
...@@ -110,11 +112,10 @@ export default { ...@@ -110,11 +112,10 @@ export default {
class="deploy-link js-deploy-url" class="deploy-link js-deploy-url"
> >
{{ deployment.external_url_formatted }} {{ deployment.external_url_formatted }}
<i <icon
class="fa fa-external-link" :size="16"
aria-hidden="true" name="external-link"
> />
</i>
</a> </a>
</template> </template>
<span <span
......
...@@ -737,6 +737,10 @@ ...@@ -737,6 +737,10 @@
> *:not(:last-child) { > *:not(:last-child) {
margin-right: .3em; margin-right: .3em;
} }
svg {
vertical-align: text-top;
}
} }
.deploy-link { .deploy-link {
......
---
title: Update external link icon in merge request widget
merge_request: 20154
author: George Tsiolis
type: changed
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