ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Fix public layout

This commit is contained in:
Christian Cueni 2020-05-04 16:12:37 +02:00
parent 5be7428b70
commit 490ce15db2
2 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/cypress/integration/beta-login.spec.js
View File

@ -48,7 +48,10 @@ describe('The Login Page', () => {
cy.get('[data-cy=logout]').click(); cy.get('[data-cy=logout]').click();
cy.visit('/beta-login'); cy.get('[data-cy=email-input]').should('exist').within(() => {
cy.visit('/beta-login');
});
cy.login(user, pw); cy.login(user, pw);
cy.get('[data-cy=header-user-widget]').should('exist').within(() => { cy.get('[data-cy=header-user-widget]').should('exist').within(() => {

47
client/src/layouts/PublicLayout.vue
View File

@ -1,17 +1,22 @@
<template> <template>
<div class="layout layout--public public"> <div class="layout layout--public public">
<logo class="public__logo"></logo> <div class="public__logo">
<router-view class="layout__content"></router-view> <logo></logo>
<footer class="layout__footer">Footer</footer> </div>
<router-view class="public__content"></router-view>
<default-footer class="skillbox__footer public__footer footer"></default-footer>
</div> </div>
</template> </template>
<script> <script>
import Logo from '@/components/icons/Logo'; import Logo from '@/components/icons/Logo';
import DefaultFooter from '@/layouts/DefaultFooter';
export default { export default {
components: {Logo}, components: {
Logo,
DefaultFooter
},
} }
</script> </script>
@ -20,16 +25,38 @@ import Logo from '@/components/icons/Logo';
@import "@/styles/_mixins.scss"; @import "@/styles/_mixins.scss";
@import "@/styles/_default-layout.scss"; @import "@/styles/_default-layout.scss";
.public { @mixin content-block {
padding-right: $medium-spacing;
padding-left: $medium-spacing;
max-width: 800px; max-width: 800px;
min-width: 320px; min-width: 320px;
padding-top: 4*$large-spacing; width: 100%;
margin: 0 auto;
}
.logo {
position: relative;
width: 260px;
height: 43px;
}
.public {
grid-template-areas: "h" "c" "f";
&__content {
@include content-block();
margin-bottom: $large-spacing;
}
&__logo { &__logo {
position: relative; @include content-block();
margin-top: $medium-spacing
}
width: 260px; &__footer {
height: 43px; background-color: $color-silver-light;
display: block;
} }
} }