diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 21:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 21:08:47 +0300 |
| commit | 93960490b8bdbc0f2ab1d102b83ec5d5b87c97a6 (patch) | |
| tree | 05e12b8fc3094f8de548aff4f929ef3433a3f52e /app/assets/javascripts/environments | |
| parent | 99670fc6a027caee34a6537c8def2e998d1ac5c2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/environments')
3 files changed, 4 insertions, 8 deletions
diff --git a/app/assets/javascripts/environments/components/environment_delete.vue b/app/assets/javascripts/environments/components/environment_delete.vue index 68392552f78..039b40a3596 100644 --- a/app/assets/javascripts/environments/components/environment_delete.vue +++ b/app/assets/javascripts/environments/components/environment_delete.vue @@ -59,7 +59,7 @@ export default { :loading="isLoading" :title="title" :aria-label="title" - container-class="btn btn-danger d-none d-sm-none d-md-block" + container-class="btn btn-danger d-none d-md-block" data-toggle="modal" data-target="#delete-environment-modal" @click="onClick" diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue index 8850ed19a4b..48e81b168ec 100644 --- a/app/assets/javascripts/environments/components/environment_item.vue +++ b/app/assets/javascripts/environments/components/environment_item.vue @@ -570,7 +570,7 @@ export default { </div> <div - class="table-section deployment-column d-none d-sm-none d-md-block" + class="table-section deployment-column d-none d-md-block" :class="tableData.deploy.spacing" role="gridcell" > @@ -594,11 +594,7 @@ export default { </div> </div> - <div - class="table-section d-none d-sm-none d-md-block" - :class="tableData.build.spacing" - role="gridcell" - > + <div class="table-section d-none d-md-block" :class="tableData.build.spacing" role="gridcell"> <a v-if="shouldRenderBuildName" :href="buildPath" class="build-link cgray"> <tooltip-on-truncate :title="buildName" diff --git a/app/assets/javascripts/environments/components/environment_terminal_button.vue b/app/assets/javascripts/environments/components/environment_terminal_button.vue index b5a7be90204..4750b8ef01b 100644 --- a/app/assets/javascripts/environments/components/environment_terminal_button.vue +++ b/app/assets/javascripts/environments/components/environment_terminal_button.vue @@ -39,7 +39,7 @@ export default { :aria-label="title" :href="terminalPath" :class="{ disabled: disabled }" - class="btn terminal-button d-none d-sm-none d-md-block text-secondary" + class="btn terminal-button d-none d-md-block text-secondary" > <gl-icon name="terminal" /> </a> |