diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 09:09:20 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 09:09:20 +0000 |
| commit | fc1df8c8307fc5022f9e8aae04164c089d8fdf2e (patch) | |
| tree | a759f58abf9e41200c48a60de73c84cab47a250d /app/assets/javascripts/ide | |
| parent | c8df22c555ab707a705e57c4257fd3ed1ce7c3b0 (diff) | |
| download | gitlab-ce-fc1df8c8307fc5022f9e8aae04164c089d8fdf2e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ide')
| -rw-r--r-- | app/assets/javascripts/ide/components/commit_sidebar/list.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/ide/components/pipelines/list.vue | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list.vue b/app/assets/javascripts/ide/components/commit_sidebar/list.vue index 2e273d45506..a15e22d4742 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list.vue @@ -94,7 +94,7 @@ export default { data-boundary="viewport" @click="openDiscardModal" > - <icon :size="16" name="remove-all" class="ml-auto mr-auto" /> + <icon :size="16" name="remove-all" class="ml-auto mr-auto position-top-0" /> </button> </div> </div> diff --git a/app/assets/javascripts/ide/components/pipelines/list.vue b/app/assets/javascripts/ide/components/pipelines/list.vue index b61d0a47795..3a63fc32639 100644 --- a/app/assets/javascripts/ide/components/pipelines/list.vue +++ b/app/assets/javascripts/ide/components/pipelines/list.vue @@ -59,7 +59,7 @@ export default { <gl-loading-icon v-if="showLoadingIcon" :size="2" class="prepend-top-default" /> <template v-else-if="hasLoadedPipeline"> <header v-if="latestPipeline" class="ide-tree-header ide-pipeline-header"> - <ci-icon :status="latestPipeline.details.status" :size="24" /> + <ci-icon :status="latestPipeline.details.status" :size="24" class="d-flex" /> <span class="prepend-left-8"> <strong> {{ __('Pipeline') }} </strong> <a @@ -76,6 +76,7 @@ export default { :help-page-path="links.ciHelpPagePath" :empty-state-svg-path="pipelinesEmptyStateSvgPath" :can-set-ci="true" + class="mb-auto mt-auto" /> <div v-else-if="latestPipeline.yamlError" class="bs-callout bs-callout-danger"> <p class="append-bottom-0">{{ __('Found errors in your .gitlab-ci.yml:') }}</p> |