Merge branch 'DES/enhancement/732-vlc-refactor/login' into DES/enhanc…

…ement/#732-vlc-refactor # Conflicts: # app/styles/app.scss
kanselarij-vlaanderen · May 4, 2021 · 27437bd · 27437bd
2 parents 37802d6 + 11fd37b
commit 27437bd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/app/pods/login/template.hbs b/app/pods/login/template.hbs
@@ -1,5 +1,5 @@
-<div style="" class="auk-u-flex full-height full-width u-padding--left--large u-padding--right--large">
-  <div class="vlc-login-content">
+<div class="auk-u-maximize-width auk-u-maximize-height u-padding--left--large u-padding--right--large auk-u-flex auk-u-flex--center">
+  <div class="auk-container--small">
     <h1 class="h1 u-spacer--tiny u-padding--bottom--large">{{t "kaleidos"}}</h1>
     <h2 class="h4 auk-u-text-normal u-padding--bottom--large">
       {{t "kaleidos-login-info"}}

diff --git a/app/styles/app.scss b/app/styles/app.scss
@@ -59,7 +59,6 @@ $icon-font-location: '/fonts/'; // overrides the default location for flanders-i
 @import 'custom-components/vlc-status-timeline';
 @import 'custom-components/vlc-subline';
 @import 'custom-components/vlc-toaster-button';
-@import 'custom-components/vlc-login';
 @import 'custom-components/vlc-color-badge-holder';
 @import 'custom-components/vlc-color-badge';
 @import 'custom-components/vlc-decision-result-select';

diff --git a/app/styles/custom-components/_vlc-login.scss b/app/styles/custom-components/_vlc-login.scss