diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-15 15:29:24 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-15 15:29:24 +0000 |
| commit | 4ca6a719a9f961efa8e9b2a9401319cbfc6403df (patch) | |
| tree | 9bb4ca662b08d9cd2695af5b8ebe80449240c386 | |
| parent | 35b31ba84fd4ea37debfaf50a5ab98a417f2158a (diff) | |
| parent | 8fa175613dad6b6ec70136ee090663d521a498c9 (diff) | |
| download | gitlab-ce-4ca6a719a9f961efa8e9b2a9401319cbfc6403df.tar.gz | |
Merge branch '28229-pipelines-loading-icon' into 'master'
Centers loading icon vertically and horizontally in pipelines table in commit view
Closes #28229
See merge request !9256
| -rw-r--r-- | app/assets/javascripts/commit/pipelines/pipelines_table.js.es6 | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/28229-pipelines-loading-icon.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6 index 5983ad4afc2..5c1a7eb1052 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6 +++ b/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6 @@ -81,8 +81,8 @@ require('./pipelines_store'); }, template: ` - <div> - <div class="pipelines realtime-loading" v-if="isLoading"> + <div class="pipelines"> + <div class="realtime-loading" v-if="isLoading"> <i class="fa fa-spinner fa-spin"></i> </div> diff --git a/changelogs/unreleased/28229-pipelines-loading-icon.yml b/changelogs/unreleased/28229-pipelines-loading-icon.yml new file mode 100644 index 00000000000..d8f82f658c2 --- /dev/null +++ b/changelogs/unreleased/28229-pipelines-loading-icon.yml @@ -0,0 +1,5 @@ +--- +title: Centers loading icon vertically and horizontally in pipelines table in commit + view +merge_request: +author: |