diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index 56e5d8fef..1398bb527 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -5,4 +5,3 @@ //= link s3_direct_upload.js //= link katex.css //= link icon.png -//= link loading-ellipsis.svg diff --git a/app/assets/images/loading-ellipsis.svg b/app/assets/images/loading-ellipsis.svg deleted file mode 100644 index 44ccecfc4..000000000 --- a/app/assets/images/loading-ellipsis.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/javascripts/utilities/buildCommentFormHTML.js.erb b/app/assets/javascripts/utilities/buildCommentFormHTML.js.erb index 325b39dcd..67aac141b 100644 --- a/app/assets/javascripts/utilities/buildCommentFormHTML.js.erb +++ b/app/assets/javascripts/utilities/buildCommentFormHTML.js.erb @@ -25,7 +25,6 @@ function buildCommentFormHTML(commentableId, commentableType, parentId) { - " alt="loading">
Create template diff --git a/app/assets/stylesheets/_functions.scss b/app/assets/stylesheets/_functions.scss deleted file mode 100644 index 8536e9d68..000000000 --- a/app/assets/stylesheets/_functions.scss +++ /dev/null @@ -1,15 +0,0 @@ -/** -* -* Generates an image path. The mixin is required -* so that webpack for Storybook and the application can both -* generate the image path correctly. -* -* $image: the image file name, e.g. 'loading-ellipsis.svg' -*/ -@function image-src($image) { - @if variable-exists(environment) and $environment == 'storybook' { - @return '../images/' + $image; - } @else { - @return image_path('loading-ellipsis.svg'); - } -} diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index 514698370..4ef9af06a 100755 --- a/app/assets/stylesheets/settings.scss +++ b/app/assets/stylesheets/settings.scss @@ -1,6 +1,5 @@ @import 'variables'; @import 'mixins'; -@import 'functions'; .github-repos { max-height: 400px; @@ -8,8 +7,7 @@ background: var(--card-bg); &.loading-repos { height: 400px; - background: white url(image-src('loading-ellipsis.svg')) no-repeat center - center; + background: white; background-size: 50px; } &.github-repos-errored { @@ -32,8 +30,7 @@ button { &:disabled { padding: var(--su-2); - background: var(--accent-brand) url(image-src('loading-ellipsis.svg')) - no-repeat center center; + background: var(--accent-brand); background-size: contain; height: 40px; width: 80px; diff --git a/app/javascript/responseTemplates/responseTemplates.js b/app/javascript/responseTemplates/responseTemplates.js index fd56b2f9e..eb5b911ad 100644 --- a/app/javascript/responseTemplates/responseTemplates.js +++ b/app/javascript/responseTemplates/responseTemplates.js @@ -169,7 +169,6 @@ function fetchResponseTemplates(formId, onTemplateSelected) { }) .then((response) => response.json()) .then((response) => { - form.querySelector('img.loading-img').classList.toggle('hidden'); let revealed; const topLevelData = document.getElementById('response-templates-data'); @@ -225,7 +224,6 @@ function copyData(responsesContainer) { } function loadData(form, onTemplateSelected) { - form.querySelector('img.loading-img').classList.toggle('hidden'); fetchResponseTemplates(form.id, onTemplateSelected); } diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb index 683501eac..25ea72f93 100644 --- a/app/views/comments/_form.html.erb +++ b/app/views/comments/_form.html.erb @@ -52,8 +52,6 @@ - " alt="loading" loading="lazy" /> -
<%# filled by JS %>