diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-22 15:09:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-22 15:09:27 +0000 |
| commit | e829ca213b25b49faa619c0363059c6ed0a5a112 (patch) | |
| tree | 0db00d8f17cf6f278cc68fb6b3739fda8d44fea6 /app/views/projects/blob/viewers | |
| parent | 6046a605fdbb6d180861c978d17fe3516b2e7507 (diff) | |
| download | gitlab-ce-e829ca213b25b49faa619c0363059c6ed0a5a112.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/blob/viewers')
| -rw-r--r-- | app/views/projects/blob/viewers/_loading.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/blob/viewers/_sketch.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/blob/viewers/_stl.html.haml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/blob/viewers/_loading.html.haml b/app/views/projects/blob/viewers/_loading.html.haml index df1f3e4e01b..606db3657a6 100644 --- a/app/views/projects/blob/viewers/_loading.html.haml +++ b/app/views/projects/blob/viewers/_loading.html.haml @@ -1,2 +1,2 @@ -.text-center.prepend-top-default.append-bottom-default +.text-center.prepend-top-default.gl-mb-3 = icon('spinner spin 2x', 'aria-hidden' => 'true', 'aria-label' => 'Loading content…', class: 'qa-spinner') diff --git a/app/views/projects/blob/viewers/_sketch.html.haml b/app/views/projects/blob/viewers/_sketch.html.haml index b4b6492b92f..22b08a85b8d 100644 --- a/app/views/projects/blob/viewers/_sketch.html.haml +++ b/app/views/projects/blob/viewers/_sketch.html.haml @@ -1,3 +1,3 @@ .file-content#js-sketch-viewer{ data: { endpoint: blob_raw_path } } - .js-loading-icon.text-center.prepend-top-default.append-bottom-default.js-loading-icon{ 'aria-label' => 'Loading Sketch preview' } + .js-loading-icon.text-center.prepend-top-default.gl-mb-3.js-loading-icon{ 'aria-label' => 'Loading Sketch preview' } = icon('spinner spin 2x', 'aria-hidden' => 'true'); diff --git a/app/views/projects/blob/viewers/_stl.html.haml b/app/views/projects/blob/viewers/_stl.html.haml index 55dd8cba7fe..cbae6057630 100644 --- a/app/views/projects/blob/viewers/_stl.html.haml +++ b/app/views/projects/blob/viewers/_stl.html.haml @@ -1,7 +1,7 @@ .file-content.is-stl-loading .text-center#js-stl-viewer{ data: { endpoint: blob_raw_path } } - = icon('spinner spin 2x', class: 'prepend-top-default append-bottom-default', 'aria-hidden' => 'true', 'aria-label' => 'Loading') - .text-center.prepend-top-default.append-bottom-default.stl-controls + = icon('spinner spin 2x', class: 'prepend-top-default gl-mb-3', 'aria-hidden' => 'true', 'aria-label' => 'Loading') + .text-center.prepend-top-default.gl-mb-3.stl-controls .btn-group %button.btn.btn-default.btn-sm.js-material-changer{ data: { type: 'wireframe' } } Wireframe |