diff --git a/app/pods/cases/case/subcases/loading/template.hbs b/app/pods/cases/case/subcases/loading/template.hbs index 14cc880a33..1ee0f7eec6 100644 --- a/app/pods/cases/case/subcases/loading/template.hbs +++ b/app/pods/cases/case/subcases/loading/template.hbs @@ -1,6 +1,2 @@ -
- {{web-components/vl-loader}} -
-{{@message}}
- {{t "loading-text"}} -
- {{else}} -- {{text}} -
- {{/if}} -+ {{t "loading-text"}} +
+ {{else}} ++ {{text}} +
+ {{/if}}- {{web-components/vl-loader text=(t "redirect-loading-text")}} -
-U bent aangemeld in Kaleidos. Kaleidos is een web toepassing waarvoor de goede werking enkel gegarandeerd is in de recente PC, Mac en Linux versies van: diff --git a/app/styles/app.scss b/app/styles/app.scss index a0486b544b..de8d7e056e 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -37,7 +37,6 @@ $icon-font-location: '/fonts/'; // overrides the default location for flanders-i @import 'govflanders/components/_input-field'; @import 'govflanders/components/_input-group'; @import 'govflanders/components/_link'; -@import 'govflanders/components/_loader'; @import 'govflanders/components/_typography'; @import 'govflanders/components/_upload'; @@ -53,7 +52,7 @@ $icon-font-location: '/fonts/'; // overrides the default location for flanders-i @import 'govflanders/additions/_button'; @import 'govflanders/additions/_checkbox'; @import 'govflanders/additions/_data-table'; -@import 'govflanders/additions/_loader'; +@import 'govflanders/additions/_not-supported'; // Additions to existing utilities @import 'govflanders/additions/_background'; diff --git a/app/styles/govflanders/additions/_loader-link.scss b/app/styles/govflanders/additions/_loader-link.scss deleted file mode 100644 index 9f79ffd7c8..0000000000 --- a/app/styles/govflanders/additions/_loader-link.scss +++ /dev/null @@ -1,12 +0,0 @@ -/* ========================================================================== - Addition: - * Different styling for loader link - ========================================================================== */ - -.vl-loader-link { - padding: 1em; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; -} diff --git a/app/styles/govflanders/additions/_loader.scss b/app/styles/govflanders/additions/_not-supported.scss similarity index 85% rename from app/styles/govflanders/additions/_loader.scss rename to app/styles/govflanders/additions/_not-supported.scss index a7764aefea..83431cff1a 100644 --- a/app/styles/govflanders/additions/_loader.scss +++ b/app/styles/govflanders/additions/_not-supported.scss @@ -1,4 +1,4 @@ -.vl-loader-container--not-supported { +.vl-not-supported { display: flex; justify-content: center; align-items: center; diff --git a/app/styles/govflanders/components/_loader.scss b/app/styles/govflanders/components/_loader.scss deleted file mode 100644 index 64d944d2c7..0000000000 --- a/app/styles/govflanders/components/_loader.scss +++ /dev/null @@ -1,21 +0,0 @@ -.vl-loader { - display: inline-block; - position: relative; - width: 3rem; - height: $base-font-size; - - &::before { - @include waveanim($alt-text-color, loader-wave); - position: absolute; - display: block; - content: ""; - width: 0.4rem; - height: 0.4rem; - box-shadow: 1rem 0 $alt-text-color, 2rem 0 $alt-text-color, 3rem 0 $alt-text-color; - border-radius: 50%; - margin-top: -0.2rem; - margin-left: -2.2rem; - top: 50%; - left: 50%; - } -} diff --git a/cypress/integration/unit/agenda.spec.js b/cypress/integration/unit/agenda.spec.js index f99f6f2886..dfb501f693 100644 --- a/cypress/integration/unit/agenda.spec.js +++ b/cypress/integration/unit/agenda.spec.js @@ -329,7 +329,7 @@ context('Agenda tests', () => { // TODO is deze not exists wel goed ? cy.get(agendaOverview.agendaEditFormallyOkButton).should('not.exist'); // TODO hoe weten we dat assert goed werkt tenzij we wachten tot de actie afgerond is - // cy.get('.vl-loader', { + // cy.get('.auk-loader', { // timeout: 60000, // }).should('not.exist'); cy.contains(newSubcase2TitleShort).should('not.exist'); diff --git a/cypress/support/commands/agenda-commands.js b/cypress/support/commands/agenda-commands.js index 33665d4990..feeb45944c 100644 --- a/cypress/support/commands/agenda-commands.js +++ b/cypress/support/commands/agenda-commands.js @@ -469,7 +469,7 @@ function addAgendaitemToAgenda(caseTitle, postponed) { cy.get('.vl-checkbox--switch__label').click(); }); } - cy.get('.vl-loader', { + cy.get('.auk-loader', { timeout: 12000, }).should('not.exist'); if (caseTitle) { @@ -481,7 +481,7 @@ function addAgendaitemToAgenda(caseTitle, postponed) { cy.wait('@getSubcasesFiltered', { timeout: 12000, }); - cy.get('.vl-loader').should('not.exist'); + cy.get('.auk-loader').should('not.exist'); cy.get('table > tbody > tr').as('rows'); } else { cy.get('table > tbody > tr').as('rows'); @@ -489,7 +489,7 @@ function addAgendaitemToAgenda(caseTitle, postponed) { timeout: 12000, }).should('not.have.length', 1); } - cy.get('.vl-loader').should('not.exist'); + cy.get('.auk-loader').should('not.exist'); cy.get('@rows', { timeout: 12000, }).eq(0)