diff options
| author | George Tsiolis <tsiolis.g@gmail.com> | 2018-06-25 17:58:02 +0300 |
|---|---|---|
| committer | George Tsiolis <tsiolis.g@gmail.com> | 2018-06-27 11:37:10 +0300 |
| commit | b4267aaa8bd317c3ccad8a84ee9f2eecfdf35d55 (patch) | |
| tree | 0835a50e72ea639b9f1d85d64d21021067b56931 /app/assets | |
| parent | 87f7597a4fb7852fc81f830158cdfd5fdec8fac4 (diff) | |
| download | gitlab-ce-b4267aaa8bd317c3ccad8a84ee9f2eecfdf35d55.tar.gz | |
Update external link icon in merge request widget
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/deployment.vue | 11 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue index c44419d24e6..5e464f8a0e2 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue @@ -1,4 +1,5 @@ <script> +import Icon from '~/vue_shared/components/icon.vue'; import timeagoMixin from '../../vue_shared/mixins/timeago'; import tooltip from '../../vue_shared/directives/tooltip'; import LoadingButton from '../../vue_shared/components/loading_button.vue'; @@ -14,6 +15,7 @@ export default { LoadingButton, MemoryUsage, StatusIcon, + Icon, }, directives: { tooltip, @@ -110,11 +112,10 @@ export default { class="deploy-link js-deploy-url" > {{ deployment.external_url_formatted }} - <i - class="fa fa-external-link" - aria-hidden="true" - > - </i> + <icon + :size="16" + name="external-link" + /> </a> </template> <span diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index ccf5d632614..efd730af558 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -737,6 +737,10 @@ > *:not(:last-child) { margin-right: .3em; } + + svg { + vertical-align: text-top; + } } .deploy-link { |