Merge branch 'master' of github.com:jumpserver/lina

This commit is contained in:
ibuler 2020-03-23 18:20:15 +08:00
commit 276e84ffb2

View File

@ -1,5 +1,5 @@
<template> <template>
<div class="footer"> <div class="footer" :style="style">
<div class="pull-right"> <div class="pull-right">
Version <strong>1.5.6-228 Version <strong>1.5.6-228
</strong> GPLv2. </strong> GPLv2.
@ -10,7 +10,7 @@
</div> </div>
</template> </template>
<script> <script>
import { mapGetters } from 'vuex'
export default { export default {
name: 'Footer', name: 'Footer',
components: { components: {
@ -20,6 +20,15 @@ export default {
return { return {
} }
},
computed: {
...mapGetters([
'sidebar'
]),
style() {
return this.sidebar.opened ? ('margin-left: 210px;') : ('margin-left: 54px')
}
} }
} }
</script> </script>
@ -40,7 +49,7 @@ export default {
padding: 10px 20px; padding: 10px 20px;
background: white; background: white;
border-top: 1px solid #e7eaec; border-top: 1px solid #e7eaec;
margin-left: 190px; transition:margin-left 0.3s;
//border-top: 1px solid #e7eaec; //border-top: 1px solid #e7eaec;
div{ div{
font-size: 13px; font-size: 13px;