From 299f4aad5b673af927e1047f2f01dc4742001da1 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Thu, 9 Apr 2020 16:26:53 +0200 Subject: [PATCH 1/2] Add new footers --- client/src/layouts/DefaultFooter.vue | 78 +++++++++++++++++++++++++ client/src/layouts/DefaultLayout.vue | 16 +++-- client/src/layouts/FullScreenLayout.vue | 4 +- client/src/layouts/PublicLayout.vue | 6 +- client/src/layouts/SimpleFooter.vue | 31 ++++++++++ client/src/layouts/SimpleLayout.vue | 47 +++++++++------ client/src/styles/_default-layout.scss | 17 +++--- client/src/styles/_mixins.scss | 10 ++++ client/src/styles/_survey.scss | 1 - client/src/styles/_variables.scss | 2 + 10 files changed, 173 insertions(+), 39 deletions(-) create mode 100644 client/src/layouts/DefaultFooter.vue create mode 100644 client/src/layouts/SimpleFooter.vue diff --git a/client/src/layouts/DefaultFooter.vue b/client/src/layouts/DefaultFooter.vue new file mode 100644 index 00000000..9cb52f12 --- /dev/null +++ b/client/src/layouts/DefaultFooter.vue @@ -0,0 +1,78 @@ + + + diff --git a/client/src/layouts/DefaultLayout.vue b/client/src/layouts/DefaultLayout.vue index 33ca3f48..95266c0e 100644 --- a/client/src/layouts/DefaultLayout.vue +++ b/client/src/layouts/DefaultLayout.vue @@ -1,13 +1,15 @@ @@ -15,12 +17,14 @@ import HeaderBar from '@/components/HeaderBar'; import MobileHeader from '@/components/MobileHeader'; import ProfileSidebar from '@/components/profile/ProfileSidebar'; + import DefaultFooter from '@/layouts/DefaultFooter'; export default { components: { HeaderBar, MobileHeader, - ProfileSidebar + ProfileSidebar, + DefaultFooter }, computed: { diff --git a/client/src/layouts/FullScreenLayout.vue b/client/src/layouts/FullScreenLayout.vue index 446edf75..5a3ea3fa 100644 --- a/client/src/layouts/FullScreenLayout.vue +++ b/client/src/layouts/FullScreenLayout.vue @@ -1,10 +1,10 @@ diff --git a/client/src/layouts/PublicLayout.vue b/client/src/layouts/PublicLayout.vue index ce607d70..d42d53df 100644 --- a/client/src/layouts/PublicLayout.vue +++ b/client/src/layouts/PublicLayout.vue @@ -1,8 +1,8 @@ diff --git a/client/src/layouts/SimpleFooter.vue b/client/src/layouts/SimpleFooter.vue new file mode 100644 index 00000000..cef1bd89 --- /dev/null +++ b/client/src/layouts/SimpleFooter.vue @@ -0,0 +1,31 @@ + + + diff --git a/client/src/layouts/SimpleLayout.vue b/client/src/layouts/SimpleLayout.vue index 58442114..73535a98 100644 --- a/client/src/layouts/SimpleLayout.vue +++ b/client/src/layouts/SimpleLayout.vue @@ -1,13 +1,33 @@ + + - - diff --git a/client/src/styles/_default-layout.scss b/client/src/styles/_default-layout.scss index e3da0b86..974a8d0f 100644 --- a/client/src/styles/_default-layout.scss +++ b/client/src/styles/_default-layout.scss @@ -1,7 +1,9 @@ @import "@/styles/_variables.scss"; @import "@/styles/_mixins.scss"; -.skillbox { +.layout { + $footer-height: 287px; + margin: 0 auto; width: 100%; /* @@ -12,17 +14,17 @@ @supports (display: grid) { display: grid; } - grid-template-rows: auto 1fr; + grid-template-rows: auto 1fr auto; + grid-template-areas: "h" "c" "f"; min-height: 100vh; grid-auto-rows: 1fr; - grid-template-areas: "h" "c"; - padding-bottom: 50px; + &--show-filter { - grid-template-rows: auto auto 1fr; - -ms-grid-rows: 50px 50px 30px 1fr; // 1 extra row for gap - grid-template-areas: "h" "." "c"; + grid-template-rows: auto auto 1fr $footer-height; + -ms-grid-rows: 50px 50px 30px 1fr $footer-height; // 1 extra row for gap + grid-template-areas: "h" "." "c" "f"; } /* @@ -48,6 +50,5 @@ &__footer { grid-area: f; - display: none; } } diff --git a/client/src/styles/_mixins.scss b/client/src/styles/_mixins.scss index 0a3d80f3..1df1b9eb 100644 --- a/client/src/styles/_mixins.scss +++ b/client/src/styles/_mixins.scss @@ -117,6 +117,16 @@ font-size: toRem(16px); } +@mixin aside-text { + @include regular-text; + font-size: toRem(14px); +} + +@mixin aside-with-cheese { + @include aside-text; + font-weight: 600; +} + @mixin meta-title { color: $color-silver-dark; font-size: toRem(36px); diff --git a/client/src/styles/_survey.scss b/client/src/styles/_survey.scss index ecfe5766..2f6e5e7b 100644 --- a/client/src/styles/_survey.scss +++ b/client/src/styles/_survey.scss @@ -159,7 +159,6 @@ } .question { - $question: &; &--error #{$question}__input { diff --git a/client/src/styles/_variables.scss b/client/src/styles/_variables.scss index d8a3f2a4..dbc9d725 100644 --- a/client/src/styles/_variables.scss +++ b/client/src/styles/_variables.scss @@ -75,3 +75,5 @@ $default-heading-line-height: 1.2; // popover $popover-default-bottom: -110px; + +$footer-width: 800px; From 159aef307500d99247eb2c44769da762659455c7 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Thu, 9 Apr 2020 17:09:01 +0200 Subject: [PATCH 2/2] Add logos --- client/src/components/icons/EhbLogo.vue | 84 +++++++++++++++++++++++++ client/src/components/icons/HepLogo.vue | 47 ++++++++++++++ client/src/layouts/DefaultFooter.vue | 31 +++++++-- 3 files changed, 156 insertions(+), 6 deletions(-) create mode 100644 client/src/components/icons/EhbLogo.vue create mode 100644 client/src/components/icons/HepLogo.vue diff --git a/client/src/components/icons/EhbLogo.vue b/client/src/components/icons/EhbLogo.vue new file mode 100644 index 00000000..1c01c0dc --- /dev/null +++ b/client/src/components/icons/EhbLogo.vue @@ -0,0 +1,84 @@ + + + diff --git a/client/src/components/icons/HepLogo.vue b/client/src/components/icons/HepLogo.vue new file mode 100644 index 00000000..7bf58ca5 --- /dev/null +++ b/client/src/components/icons/HepLogo.vue @@ -0,0 +1,47 @@ + + + diff --git a/client/src/layouts/DefaultFooter.vue b/client/src/layouts/DefaultFooter.vue index 9cb52f12..a048eaab 100644 --- a/client/src/layouts/DefaultFooter.vue +++ b/client/src/layouts/DefaultFooter.vue @@ -10,12 +10,10 @@

- - + + + +