Merge branch 'DES/enhancement/705-vl-refactor/textarea' into DES/enha…

…ncement/#705-vl-refactor # Conflicts: # app/styles/app.scss # app/styles/au-kaleidos-css/_auk-content.scss # app/styles/au-kaleidos-css/_auk-textarea.scss # app/styles/au-kaleidos-css/_s-colors.scss
kanselarij-vlaanderen · Mar 8, 2021 · 64ee8dc · 64ee8dc
2 parents 3682492 + bb59d52
commit 64ee8dc
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 57 deletions.
diff --git a/app/pods/components/agenda/agendaitem/agendaitem-case/agendaitem-titles-edit/template.hbs b/app/pods/components/agenda/agendaitem/agendaitem-case/agendaitem-titles-edit/template.hbs
@@ -14,7 +14,7 @@
       {{textarea
         data-test-agendaitem-titles-edit-shorttitle
         rows="2"
-        class="vl-textarea vl-textarea--block"
+        class="auk-textarea"
         value=@agendaitem.shortTitle
       }}
     </div>
@@ -25,7 +25,7 @@
       {{textarea
         data-test-agendaitem-titles-edit-title
         rows="4"
-        class="vl-textarea vl-textarea--block"
+        class="auk-textarea"
         value=@agendaitem.title
       }}
     </div>
@@ -36,7 +36,7 @@
       {{textarea
         data-test-agendaitem-titles-edit-explanation
         rows="2"
-        class="vl-textarea vl-textarea--block"
+        class="auk-textarea"
         value=@agendaitem.explanation
       }}
     </div>

diff --git a/app/pods/components/agendaitem-press-edit/template.hbs b/app/pods/components/agendaitem-press-edit/template.hbs
@@ -6,7 +6,7 @@
   <div class="vlc-input-field-block">
     {{web-components/vl-form-label value=(t "content")}}
     {{textarea
-      class="vl-textarea vl-textarea--block"
+      class="auk-textarea"
       rows="10"
       value=agendaitem.textPress
     }}

diff --git a/app/pods/components/cases/edit-case/template.hbs b/app/pods/components/cases/edit-case/template.hbs
@@ -5,7 +5,7 @@
         {{web-components/vl-form-label value=(t "name-subcase")}}
         {{textarea
           rows="2"
-          class="vl-textarea vl-textarea--block"
+          class="auk-textarea"
           value=(mut caseToEdit.shortTitle)
         }}
       </div>

diff --git a/app/pods/components/cases/new-case/template.hbs b/app/pods/components/cases/new-case/template.hbs
@@ -14,7 +14,7 @@
     </div>
     <div class="vlc-input-field-block {{getClassForShortTitle}}" data-test-metadata-form>
       {{web-components/vl-form-label value=(t "short-title-case")}}
-      {{textarea class="vl-textarea vl-textarea--block" rows="2" value=shortTitle}}
+      {{textarea class="auk-textarea" rows="2" value=shortTitle}}
     </div>
   </div>
   <div class="vlc-navbar vlc-navbar--bordered-top">

diff --git a/app/pods/components/cases/new-subcase/template.hbs b/app/pods/components/cases/new-subcase/template.hbs
@@ -21,13 +21,13 @@
       {{web-components/vl-form-label value=(t "name-subcase")}}
       {{textarea
         rows="2"
-        class="vl-textarea vl-textarea--block"
+        class="auk-textarea"
         value=shortTitle
       }}
     </div>
     <div class="vlc-input-field-block">
       {{web-components/vl-form-label value=(t "title-subcase")}}
-      {{textarea rows="4" class="vl-textarea vl-textarea--block" value=title}}
+      {{textarea rows="4" class="auk-textarea" value=title}}
     </div>
     <div class="vlc-input-field-block">
       {{web-components/vl-form-label value=(t "subcase-type-dropdown")}}

diff --git a/app/pods/components/subcase/subcase-case/subcase-titles-edit/template.hbs b/app/pods/components/subcase/subcase-case/subcase-titles-edit/template.hbs
@@ -28,7 +28,7 @@
     {{textarea
       data-test-subcase-titles-edit-shorttitle
       rows="2"
-      class="vl-textarea vl-textarea--block"
+      class="auk-textarea"
       value=subcase.shortTitle
     }}
   </div>
@@ -39,7 +39,7 @@
     {{textarea
       data-test-subcase-titles-edit-title
       rows="4"
-      class="vl-textarea vl-textarea--block"
+      class="auk-textarea"
       value=subcase.title
     }}
   </div>

diff --git a/app/pods/components/utils/system-alert-form/template.hbs b/app/pods/components/utils/system-alert-form/template.hbs
@@ -37,7 +37,7 @@
     {{web-components/vl-form-label value=(t "message")}}
     {{textarea
       rows="2"
-      class="vl-textarea vl-textarea--block"
+      class="auk-textarea"
       value=this.alert.message
     }}
   </div>

diff --git a/app/pods/styleguide/panels/template.hbs b/app/pods/styleguide/panels/template.hbs
@@ -154,11 +154,11 @@
     <pl.Body>
       <div class="vlc-input-field-block">
         <WebComponents::VlFormLabel @value="Label"/>
-        {{textarea class="vl-textarea vl-textarea--block" rows="2" value=shortTitle}}
+        {{textarea class="auk-textarea" rows="2" value=shortTitle}}
       </div>
       <div class="vlc-input-field-block">
         <WebComponents::VlFormLabel @value="Label"/>
-        {{textarea class="vl-textarea vl-textarea--block" rows="2" value=shortTitle}}
+        {{textarea class="auk-textarea" rows="2" value=shortTitle}}
       </div>
     </pl.Body>
     <pl.Footer>

diff --git a/app/styles/app.scss b/app/styles/app.scss
@@ -43,7 +43,6 @@ $icon-font-location: '/fonts/'; // overrides the default location for flanders-i
 @import 'govflanders/components/_pill';
 @import 'govflanders/components/_radio';
 @import 'govflanders/components/_tabs';
-@import 'govflanders/components/_textarea';
 @import 'govflanders/components/_typography';
 @import 'govflanders/components/_upload';
 

diff --git a/app/styles/au-kaleidos-css/_auk-textarea.scss b/app/styles/au-kaleidos-css/_auk-textarea.scss
@@ -6,6 +6,7 @@
   border: 0.1rem solid $au-gray-300;
   padding: .6rem;
   width: 100%;
+  max-width: 100%;
   font-family: flanders-sans, sans-serif;
   font-size: 1.5rem;
   color: $au-gray-800;

diff --git a/app/styles/govflanders/components/_textarea.scss b/app/styles/govflanders/components/_textarea.scss
diff --git a/cypress/integration/unit/case/case.spec.js b/cypress/integration/unit/case/case.spec.js
@@ -51,7 +51,7 @@ context('Create case as Admin user', () => {
     cy.get(modal.publication.alertError).contains('Kijk het formulier na');
     cy.get('.vlc-input-field-block').eq(1)
       .within(() => {
-        cy.get('.vl-textarea').click()
+        cy.get('.auk-textarea').click()
           .clear()
           .type(newShortTitle);
       });

diff --git a/cypress/support/commands/case-commands.js b/cypress/support/commands/case-commands.js
@@ -40,7 +40,7 @@ function createCase(confidential, shortTitle) {
   // Set short title
   cy.get('@newCaseForm').eq(1)
     .within(() => {
-      cy.get('.vl-textarea').click()
+      cy.get('.auk-textarea').click()
         .type(shortTitle);
     });
 
@@ -102,7 +102,7 @@ function addSubcase(type, newShortTitle, longTitle, step, stepName) {
   if (newShortTitle) {
     cy.get('.vlc-input-field-block').eq(1)
       .within(() => {
-        cy.get('.vl-textarea').click()
+        cy.get('.auk-textarea').click()
           .clear()
           .type(newShortTitle);
       });
@@ -112,7 +112,7 @@ function addSubcase(type, newShortTitle, longTitle, step, stepName) {
   if (longTitle) {
     cy.get('.vlc-input-field-block').eq(2)
       .within(() => {
-        cy.get('.vl-textarea').click()
+        cy.get('.auk-textarea').click()
           .clear()
           .type(longTitle);
       });

diff --git a/cypress/support/commands/subcase-commands.js b/cypress/support/commands/subcase-commands.js
@@ -118,7 +118,7 @@ function changeSubcaseAccessLevel(isRemark, shortTitle, confidentialityChange, a
       if (newLongTitle) {
         cy.get('@editCaseForm').eq(2)
           .within(() => {
-            cy.get('.vl-textarea').click()
+            cy.get('.auk-textarea').click()
               .clear()
               .type(newLongTitle);
           });
@@ -137,15 +137,15 @@ function changeSubcaseAccessLevel(isRemark, shortTitle, confidentialityChange, a
     if (newShortTitle) {
       cy.get('@editCaseForm').eq(1)
         .within(() => {
-          cy.get('.vl-textarea').click()
+          cy.get('.auk-textarea').click()
             .clear()
             .type(newShortTitle);
         });
     }
     if (newLongTitle) {
       cy.get('@editCaseForm').eq(2)
         .within(() => {
-          cy.get('.vl-textarea').click()
+          cy.get('.auk-textarea').click()
             .clear()
             .type(newLongTitle);
         });