From 7240730148aab534c7975ad1de366d615f79cf76 Mon Sep 17 00:00:00 2001 From: Karel Persoons Date: Mon, 12 Apr 2021 18:16:20 +0200 Subject: [PATCH 1/2] Replace vlc-box occurrences --- .../agendaitem/agendaitem-case/agendaitem-titles-edit.hbs | 2 +- app/components/agenda/agendaitem/agendaitem-decision-edit.hbs | 2 +- app/components/agendaitem-press-edit.js | 2 +- app/components/documents/batch-document-edit.hbs | 2 +- .../mandatees-domains-panel/mandatees-domains-panel-edit.hbs | 2 +- app/components/news-item/edit-item.js | 2 +- app/components/subcase/subcase-case/subcase-titles-edit.js | 2 +- app/components/subcases/subcase-description.hbs | 2 +- app/pods/search/agenda-items/template.hbs | 2 +- app/pods/search/cases/template.hbs | 2 +- cypress/integration/e2e/propagatie-overheid.spec.js | 2 +- cypress/integration/unit/decision.spec.js | 2 +- cypress/support/commands/subcase-commands.js | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/components/agenda/agendaitem/agendaitem-case/agendaitem-titles-edit.hbs b/app/components/agenda/agendaitem/agendaitem-case/agendaitem-titles-edit.hbs index 91eb8db98a..a46b3dd0fb 100644 --- a/app/components/agenda/agendaitem/agendaitem-case/agendaitem-titles-edit.hbs +++ b/app/components/agenda/agendaitem/agendaitem-case/agendaitem-titles-edit.hbs @@ -1,4 +1,4 @@ -
+
{{#if @subcase}}
diff --git a/app/components/agenda/agendaitem/agendaitem-decision-edit.hbs b/app/components/agenda/agendaitem/agendaitem-decision-edit.hbs index a8a8ce409d..c886a318f3 100644 --- a/app/components/agenda/agendaitem/agendaitem-decision-edit.hbs +++ b/app/components/agenda/agendaitem/agendaitem-decision-edit.hbs @@ -1,4 +1,4 @@ -
+
{{!-- Editor with annotated decision text will come somwhere around here in the future --}}
{{else}} -
+
diff --git a/app/components/mandatees/mandatees-domains-panel/mandatees-domains-panel-edit.hbs b/app/components/mandatees/mandatees-domains-panel/mandatees-domains-panel-edit.hbs index 47ed7c652b..dc234e397c 100644 --- a/app/components/mandatees/mandatees-domains-panel/mandatees-domains-panel-edit.hbs +++ b/app/components/mandatees/mandatees-domains-panel/mandatees-domains-panel-edit.hbs @@ -1,4 +1,4 @@ -
+
diff --git a/app/components/news-item/edit-item.js b/app/components/news-item/edit-item.js index c5022b141d..6dcc4e22dc 100644 --- a/app/components/news-item/edit-item.js +++ b/app/components/news-item/edit-item.js @@ -4,7 +4,7 @@ import { inject } from '@ember/service'; export default Component.extend({ intl: inject(), - classNames: ['vlc-box'], + classNames: ['auk-box'], isTryingToSave: false, isExpanded: false, diff --git a/app/components/subcase/subcase-case/subcase-titles-edit.js b/app/components/subcase/subcase-case/subcase-titles-edit.js index 91d4915f24..8be7c431de 100644 --- a/app/components/subcase/subcase-case/subcase-titles-edit.js +++ b/app/components/subcase/subcase-case/subcase-titles-edit.js @@ -10,7 +10,7 @@ import { trimText } from 'frontend-kaleidos/utils/trim-util'; export default class SubcaseTitlesEdit extends Component { @service store; - classNames = ['vlc-box', 'auk-u-mt-4']; + classNames = ['auk-box', 'auk-u-mt-4']; propertiesToSet = Object.freeze(['title', 'shortTitle', 'accessLevel', 'confidential']); @action diff --git a/app/components/subcases/subcase-description.hbs b/app/components/subcases/subcase-description.hbs index 9299679acc..6c9749a8ae 100644 --- a/app/components/subcases/subcase-description.hbs +++ b/app/components/subcases/subcase-description.hbs @@ -146,7 +146,7 @@ {{else}} -
+
{{web-components/vl-radio-button-list diff --git a/app/pods/search/agenda-items/template.hbs b/app/pods/search/agenda-items/template.hbs index b80949e82a..1bd44c124d 100644 --- a/app/pods/search/agenda-items/template.hbs +++ b/app/pods/search/agenda-items/template.hbs @@ -3,7 +3,7 @@ }}
-
+
{{t "type"}}
-
+
{{t "type"}} { cy.get(agenda.accessLevelSave).click(); cy.contains('Wijzigen').click(); - cy.get('.vlc-box').as('editDecision'); + cy.get('.auk-box').as('editDecision'); cy.get('@editDecision').within(() => { cy.get(agenda.decisionPowerSelectContainer).should('exist') .should('be.visible') diff --git a/cypress/integration/unit/decision.spec.js b/cypress/integration/unit/decision.spec.js index 2d677c61d9..e2e3dadb45 100644 --- a/cypress/integration/unit/decision.spec.js +++ b/cypress/integration/unit/decision.spec.js @@ -202,7 +202,7 @@ context('Add files to an agenda', () => { cy.route('PATCH', 'agenda-item-treatments/**').as('patchTreatment'); cy.contains('Wijzigen').click(); - cy.get('.vlc-box').within(() => { + cy.get('.auk-box').within(() => { cy.get(agenda.decisionPowerSelectContainer).should('exist') .should('be.visible') .within(() => { diff --git a/cypress/support/commands/subcase-commands.js b/cypress/support/commands/subcase-commands.js index cf23743a7b..3cfa4f5b77 100644 --- a/cypress/support/commands/subcase-commands.js +++ b/cypress/support/commands/subcase-commands.js @@ -101,7 +101,7 @@ function changeSubcaseAccessLevel(isRemark, shortTitle, confidentialityChange, a cy.get('a').click(); }); - cy.get('.vlc-box').as('subcaseAccessLevel'); + cy.get('.auk-box').as('subcaseAccessLevel'); if (accessLevel) { cy.get('@subcaseAccessLevel').within(() => { From ea989cd542d0aa56c570b6bf8e40211ceb8dc140 Mon Sep 17 00:00:00 2001 From: Karel Persoons Date: Mon, 12 Apr 2021 18:18:07 +0200 Subject: [PATCH 2/2] Remove vlc-box code source and additional rules --- app/styles/app.scss | 1 - app/styles/custom-components/_vlc-box.scss | 14 -------------- 2 files changed, 15 deletions(-) delete mode 100644 app/styles/custom-components/_vlc-box.scss diff --git a/app/styles/app.scss b/app/styles/app.scss index 2409b5acb8..dcb277bf3e 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -49,7 +49,6 @@ $icon-font-location: '/fonts/'; // overrides the default location for flanders-i @import 'custom-components/vlc-agenda-meta'; @import 'custom-components/vlc-backlink'; @import 'custom-components/vlc-block-link'; -@import 'custom-components/vlc-box'; @import 'custom-components/vlc-button'; @import 'custom-components/vlc-button-in-input'; @import 'custom-components/vlc-button-link'; diff --git a/app/styles/custom-components/_vlc-box.scss b/app/styles/custom-components/_vlc-box.scss deleted file mode 100644 index 01e678ac8c..0000000000 --- a/app/styles/custom-components/_vlc-box.scss +++ /dev/null @@ -1,14 +0,0 @@ -/* ========================================================================== - vlc-box - Just a grey box - ========================================================================== */ - -.vlc-box { - background: $porcelain; - padding: 2rem; - margin: 0 0 4rem; -} - -.vlc-box--padding-sides-only { - padding: 0 2rem; -}