Skip to content

Commit

Permalink
Merge branch 'DES/enhancement/732-vlc-refactor/box' into DES/enhancem…
Browse files Browse the repository at this point in the history
…ent/#732-vlc-refactor
  • Loading branch information
brenner-company committed Apr 15, 2021
2 parents 008a2f2 + ea989cd commit 7d9e7da
Show file tree
Hide file tree
Showing 15 changed files with 13 additions and 28 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="vlc-box">
<div class="auk-box">
<div class="auk-u-mb-4">
{{#if @subcase}}
<div class="vlc-input-field-block">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="vlc-box">
<div class="auk-box">
{{!-- Editor with annotated decision text will come somwhere around here in the future --}}
<div class="vlc-input-field vlc-input-field-block auk-u-mb-4"
data-test-decision-edit-power-select-container
Expand Down
2 changes: 1 addition & 1 deletion app/components/agendaitem-press-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import CONFIG from 'frontend-kaleidos/utils/config';
import { updateModifiedProperty } from 'frontend-kaleidos/utils/modification-utils';

export default Component.extend({
classNames: ['vlc-box'],
classNames: ['auk-box'],
isTableRow: false,
store: inject(),
actions: {
Expand Down
2 changes: 1 addition & 1 deletion app/components/documents/batch-document-edit.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{{#if this.loadData.isRunning}}
<WebComponents::VlLoader @text={{t "documents-loading-text"}} />
{{else}}
<div class="vlc-box">
<div class="auk-box">
<div class="auk-u-mb-4">
<table class="auk-table">
<thead>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="vlc-box">
<div class="auk-box">
<div class="vlc-input-field-block">
<div class="auk-u-mb-8">
<table class="auk-table">
Expand Down
2 changes: 1 addition & 1 deletion app/components/news-item/edit-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion app/components/subcase/subcase-case/subcase-titles-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/components/subcases/subcase-description.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
</div>
</div>
{{else}}
<div class="vlc-box">
<div class="auk-box">
<div class="auk-u-mb-4">
<div class="vlc-input-field-block">
{{web-components/vl-radio-button-list
Expand Down
2 changes: 1 addition & 1 deletion app/pods/search/agenda-items/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
}}
<div class="auk-o-grid auk-u-mb-2">
<div class="auk-o-grid-col-2">
<div class="vlc-box">
<div class="auk-box">
<div class="auk-u-mb-2">
<WebComponents::AuLabel>{{t "type"}}</WebComponents::AuLabel>
<WebComponents::VlCheckbox
Expand Down
2 changes: 1 addition & 1 deletion app/pods/search/cases/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
}}
<div class="auk-o-grid auk-u-mb-2">
<div class="auk-o-grid-col-2">
<div class="vlc-box">
<div class="auk-box">
<div class="auk-u-mb-2">
<WebComponents::AuLabel>{{t "type"}}</WebComponents::AuLabel>
<WebComponents::VlCheckbox
Expand Down
1 change: 0 additions & 1 deletion app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
14 changes: 0 additions & 14 deletions app/styles/custom-components/_vlc-box.scss

This file was deleted.

2 changes: 1 addition & 1 deletion cypress/integration/e2e/propagatie-overheid.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ context('Propagation to other graphs', () => {

// TODO verify if this is needed, default treatments for agendaitem is approved anyway
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')
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/unit/decision.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/support/commands/subcase-commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand Down

0 comments on commit 7d9e7da

Please sign in to comment.