Skip to content

Commit

Permalink
refactor(footer): use single footer height
Browse files Browse the repository at this point in the history
looks fine that way in both small and large version
  • Loading branch information
TheGreatRefrigerator committed Apr 9, 2024
1 parent 0cc55de commit a8e3584
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/fragments/footer/Footer.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<v-footer dark
:style="{'margin-top': $vuetify.breakpoint.smAndDown ? '-' + $store.getters.footerMiniHeight + 'px': '-' + $store.getters.footerFullHeight + 'px'}"
:height="$vuetify.breakpoint.smAndDown? $store.getters.footerMiniHeight : $store.getters.footerFullHeight">
:style="{'margin-top':'-' + $store.getters.footerHeight + 'px'}"
:height="$store.getters.footerHeight">
<v-layout justify-center column wrap >
<span><a :style="linkColor" target="_blank" href="https://github.com/GIScience/ors-map-client">v{{ appVersion }}</a>&nbsp;|&nbsp;© {{currentYear}} <strong>{{footerMainSiteName}}</strong></span>
<div>{{ $t('global.developedByIntro') }}
Expand Down
2 changes: 1 addition & 1 deletion src/fragments/sidebar/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<!-- sidebar-content padding-bottom must be the same that is calculated in footer component height -->
<div class="sidebar-content" :style="{height: sidebarContentHeightFormula}">
<div class="sidebar-content-form" :style="{'padding-bottom': $vuetify.breakpoint.smAndDown ? $store.getters.footerMiniHeight + 'px': $store.getters.footerFullHeight + 'px'}">
<div class="sidebar-content-form" :style="{'padding-bottom': $store.getters.footerHeight + 'px'}">
<map-form v-if="$store.getters.mapReady" class="map-search"></map-form>
<v-expansion-panel :value="null" v-if="!$highResolution">
<v-expansion-panel-content style="background: transparent;">
Expand Down
10 changes: 3 additions & 7 deletions src/store/modules/app-ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ const state = {
pickPlaceIndex: null,
pickPlaceId: null,
mainMenu: [],
footerFullHeight: 89,
footerMiniHeight: 140,
footerHeight: 89,
sidebarFullWidth: 400,
sidebarShrunkWidth: 290,
sidebarHeaderHeight: 175,
Expand All @@ -28,11 +27,8 @@ const getters = {
mainMenu: state => {
return state.mainMenu
},
footerFullHeight: state => {
return state.footerFullHeight
},
footerMiniHeight: state => {
return state.footerMiniHeight
footerHeight: state => {
return state.footerHeight
},
sidebarHeaderHeight: state => {
return state.sidebarHeaderHeight
Expand Down

0 comments on commit a8e3584

Please sign in to comment.