diff options
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components')
6 files changed, 14 insertions, 20 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue index 996e54a1183..7d74d5531b4 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue @@ -64,7 +64,7 @@ export default { :title="buttonTitle" :loading="isLoading" :disabled="isActionInProgress" - :class="`btn btn-default btn-sm inline prepend-left-4 ${containerClasses}`" + :class="`btn btn-default btn-sm inline gl-ml-2 ${containerClasses}`" @click="$emit('click')" > <span class="d-inline-flex align-items-baseline"> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue index 5dabd9fe5fe..bce25ca20ec 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue @@ -75,11 +75,11 @@ export default { rel="noopener noreferrer nofollow" class="js-deploy-url-menu-item menu-item" > - <strong class="str-truncated-100 append-bottom-0 d-block"> + <strong class="str-truncated-100 gl-mb-0 d-block"> {{ slotProps.result.path }} </strong> - <p class="text-secondary str-truncated-100 append-bottom-0 d-block"> + <p class="text-secondary str-truncated-100 gl-mb-0 d-block"> {{ slotProps.result.external_url }} </p> </gl-link> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue index 2433ba879aa..0464c4b9c15 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue @@ -117,7 +117,7 @@ export default { :href="webIdePath" :title="ideButtonTitle" :class="{ disabled: !mr.canPushToSourceBranch }" - class="btn btn-default js-web-ide d-none d-md-inline-block append-right-8" + class="btn btn-default js-web-ide d-none d-md-inline-block gl-mr-3" data-placement="bottom" tabindex="0" role="button" @@ -129,7 +129,7 @@ export default { :disabled="mr.sourceBranchRemoved" data-target="#modal_merge_info" data-toggle="modal" - class="btn btn-default js-check-out-branch append-right-8" + class="btn btn-default js-check-out-branch gl-mr-3" type="button" > {{ s__('mrWidget|Check out branch') }} diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_terraform_plan.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_terraform_plan.vue index 8313b8afb1b..2ef5e81b36b 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_terraform_plan.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_terraform_plan.vue @@ -1,16 +1,15 @@ <script> import { __ } from '~/locale'; -import { GlIcon, GlLoadingIcon, GlSprintf } from '@gitlab/ui'; +import { GlIcon, GlLink, GlLoadingIcon, GlSprintf } from '@gitlab/ui'; import axios from '~/lib/utils/axios_utils'; -import CiIcon from '../../vue_shared/components/ci_icon.vue'; import flash from '~/flash'; import Poll from '~/lib/utils/poll'; export default { name: 'MRWidgetTerraformPlan', components: { - CiIcon, GlIcon, + GlLink, GlLoadingIcon, GlSprintf, }, @@ -36,17 +35,12 @@ export default { deleteNum() { return Number(this.plan.delete); }, - iconStatusObj() { - return { - group: 'warning', - icon: 'status_warning', - }; - }, logUrl() { return this.plan.job_path; }, plan() { - return this.plans['tfplan.json'] || {}; + const firstPlanKey = Object.keys(this.plans)[0]; + return this.plans[firstPlanKey] ?? {}; }, validPlanValues() { return this.addNum + this.changeNum + this.deleteNum >= 0; @@ -90,7 +84,7 @@ export default { <section class="mr-widget-section"> <div class="mr-widget-body media d-flex flex-row"> <span class="append-right-default align-self-start align-self-lg-center"> - <ci-icon :status="iconStatusObj" :size="24" /> + <gl-icon name="status_warning" :size="24" /> </span> <div class="d-flex flex-fill flex-column flex-md-row"> @@ -125,7 +119,7 @@ export default { </div> <div class="terraform-mr-plan-actions"> - <a + <gl-link v-if="logUrl" :href="logUrl" target="_blank" @@ -137,7 +131,7 @@ export default { > {{ __('View full log') }} <gl-icon name="external-link" /> - </a> + </gl-link> </div> </div> </div> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue b/app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue index 6aad2a26a53..a0e76b151f7 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue @@ -14,7 +14,7 @@ export default { </script> <template> - <p v-once class="mr-info-list mr-links append-bottom-0"> + <p v-once class="mr-info-list mr-links gl-mb-0"> <span class="status-text" v-html="removesBranchText"> </span> <i v-tooltip :title="tooltipTitle" :aria-label="tooltipTitle" class="fa fa-question-circle"> </i> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue index b1fb377e47a..c3cc30a1a6f 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue @@ -127,7 +127,7 @@ export default { </button> <span v-if="!rebasingError" class="bold">{{ __( - 'Fast-forward merge is not possible. Rebase the source branch onto the target branch or merge target branch into source branch to allow this merge request to be merged.', + 'Fast-forward merge is not possible. Rebase the source branch onto the target branch.', ) }}</span> <span v-else class="bold danger">{{ rebasingError }}</span> |