ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

move client-only wrapper into LocaleSwitch component

Browse Source 
so we don't have to wrap <locale-switch> in <client-only> every time we use it
This commit is contained in:
Alina Beck 2020-02-11 11:14:59 +01:00
parent 09dee69ee0
commit d460819dee
5 changed files with 38 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/LocaleSwitch/LocaleSwitch.vue
View File

@ -1,4 +1,5 @@
<template> <template>
<client-only>
<dropdown ref="menu" :placement="placement" :offset="offset"> <dropdown ref="menu" :placement="placement" :offset="offset">
<a <a
slot="default" slot="default"
@ -30,6 +31,7 @@
</ds-menu-item> </ds-menu-item>
</ds-menu> </ds-menu>
</dropdown> </dropdown>
</client-only>
</template> </template>
<script> <script>

2
webapp/layouts/basic.vue
View File

@ -10,9 +10,7 @@
</a> </a>
</ds-flex-item> </ds-flex-item>
<ds-flex-item width="20%" style="flex-grow:0;"> <ds-flex-item width="20%" style="flex-grow:0;">
<client-only>
<locale-switch class="topbar-locale-switch" placement="top" offset="16" /> <locale-switch class="topbar-locale-switch" placement="top" offset="16" />
</client-only>
</ds-flex-item> </ds-flex-item>
</ds-flex> </ds-flex>
</ds-container> </ds-container>

2
webapp/layouts/default.vue
View File

@ -50,9 +50,7 @@
}" }"
style="flex-basis: auto;" style="flex-basis: auto;"
> >
<client-only>
<locale-switch class="topbar-locale-switch" placement="top" offset="8" /> <locale-switch class="topbar-locale-switch" placement="top" offset="8" />
</client-only>
<template v-if="isLoggedIn"> <template v-if="isLoggedIn">
<client-only> <client-only>
<notification-menu placement="top" /> <notification-menu placement="top" />

6
webapp/maintenance/source/pages/index.vue
View File

@ -1,11 +1,9 @@
<template> <template>
<transition name="fade" appear> <transition name="fade" appear>
<ds-container width="medium"> <ds-container width="medium">
<ds-card> <base-card>
<ds-space> <ds-space>
<client-only>
<locale-switch class="login-locale-switch" offset="5" /> <locale-switch class="login-locale-switch" offset="5" />
</client-only>
</ds-space> </ds-space>
<ds-flex> <ds-flex>
<ds-flex-item :width="{ base: '100%', sm: 1, md: 1 }"> <ds-flex-item :width="{ base: '100%', sm: 1, md: 1 }">
@ -31,7 +29,7 @@
</ds-flex-item> </ds-flex-item>
</ds-flex-item> </ds-flex-item>
</ds-flex> </ds-flex>
</ds-card> </base-card>
</ds-container> </ds-container>
</transition> </transition>
</template> </template>

2
webapp/pages/registration.vue
View File

@ -3,9 +3,7 @@
<ds-card> <ds-card>
<ds-flex gutter="small"> <ds-flex gutter="small">
<ds-flex-item :width="{ base: '100%', sm: '50%' }"> <ds-flex-item :width="{ base: '100%', sm: '50%' }">
<client-only>
<locale-switch offset="5" /> <locale-switch offset="5" />
</client-only>
<ds-space margin-top="small" margin-bottom="xxx-small"> <ds-space margin-top="small" margin-bottom="xxx-small">
<img class="signup-image" alt="Human Connection" src="/img/sign-up/nicetomeetyou.svg" /> <img class="signup-image" alt="Human Connection" src="/img/sign-up/nicetomeetyou.svg" />
</ds-space> </ds-space>