Merge branch 'DES/enhancement/732-vlc-refactor/container' into DES/en…

…hancement/#732-vlc-refactor
kanselarij-vlaanderen · Apr 15, 2021 · c42ef24 · c42ef24
2 parents b5c033f + 055ea95
commit c42ef24
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 18 deletions.
diff --git a/app/components/agenda/agenda-decisions.hbs b/app/components/agenda/agenda-decisions.hbs
@@ -1,4 +1,4 @@
-<div class="vlc-container-center">
+<div class="auk-container auk-container--center">
   <div class="auk-u-mt-8 no-print">
     <h3 class="auk-h2" data-test-print-overview-decisions-title>
       {{await title}}

diff --git a/app/components/agenda/press-agenda.hbs b/app/components/agenda/press-agenda.hbs
@@ -1,4 +1,4 @@
-<div class="vlc-container-center">
+<div class="auk-container auk-container--center">
   <Utils::LogoHeader />
   <div class="auk-u-mb-8">
     <h1 class="auk-h1">

diff --git a/app/components/agenda/printable-agenda.hbs b/app/components/agenda/printable-agenda.hbs
@@ -1,4 +1,4 @@
-<div data-test-agenda-printContainer class="vlc-container-center auk-content vlc-printable-agenda-list">
+<div data-test-agenda-printContainer class="auk-container auk-container--center auk-content vlc-printable-agenda-list">
   {{utils/logo-header}}
 
   <h4 class="vlc-printable-agenda-list__session-title" data-test-agenda-print-header-title>

diff --git a/app/components/newsletter-table/table-row.hbs b/app/components/newsletter-table/table-row.hbs
@@ -57,7 +57,7 @@
 {{#if this.isEditing}}
   <tr class="lt-row lt-expanded-row">
     <td colspan="5">
-      <div class="vlc-container-center">
+      <div class="auk-container auk-container--center">
         <NewsItem::EditItem
           @newsletterInfo={{this.newsletterInfo}}
           @agendaitem={{@agendaitem}}

diff --git a/app/pods/newsletter/print/template.hbs b/app/pods/newsletter/print/template.hbs
@@ -7,7 +7,7 @@
 }}
 <div class="vlc-scroll-wrapper__body vlc-hide-scrollbar-on-print">
   <div class="auk-u-m-8">
-    <div class="vlc-container-center">
+    <div class="auk-container auk-container--center">
       <Utils::LogoHeader/>
       <Newsletter::NewsletterMeeting
         @allowEditing={{not this.showDraft}}

diff --git a/app/styles/app.scss b/app/styles/app.scss
@@ -52,7 +52,6 @@ $icon-font-location: '/fonts/'; // overrides the default location for flanders-i
 @import 'custom-components/vlc-button-link';
 @import 'custom-components/vlc-button-toolbar';
 @import 'custom-components/vlc-subcase-description';
-@import 'custom-components/vlc-container';
 @import 'custom-components/vlc-date-range';
 @import 'custom-components/vlc-document-card';
 @import 'custom-components/vlc-document-list';

diff --git a/app/styles/au-kaleidos-css/_auk-container.scss b/app/styles/au-kaleidos-css/_auk-container.scss
@@ -6,6 +6,14 @@
   max-width: 90rem;
 }
 
+.auk-container--small {
+  max-width: 70rem;
+}
+
+.auk-container--large {
+  max-width: 110rem;
+}
+
 .auk-container--center {
   margin: 0 auto;
 }
diff --git a/app/styles/custom-components/_vlc-container.scss b/app/styles/custom-components/_vlc-container.scss