mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
improved navigation layout when not logged in, moved locale selector to nav on login page
This commit is contained in:
parent
6589fe10af
commit
e0fec965dc
@ -1,14 +1,15 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="layout-blank">
|
<div class="layout-blank">
|
||||||
<div class="main-navigation">
|
<div class="main-navigation">
|
||||||
<ds-container class="main-navigation-container" style="padding: 10px 10px;">
|
<ds-container width="x-large" class="main-navigation-container" style="padding: 10px 10px;">
|
||||||
<ds-flex style="flex: auto; flex-direction: row;">
|
<ds-flex class="main-navigation-flex" centered>
|
||||||
<ds-flex-item>
|
<ds-flex-item width="5.5%" />
|
||||||
|
<ds-flex-item style="flex-grow:1;" width="20%">
|
||||||
<a @click="redirectToRoot">
|
<a @click="redirectToRoot">
|
||||||
<ds-logo />
|
<ds-logo />
|
||||||
</a>
|
</a>
|
||||||
</ds-flex-item>
|
</ds-flex-item>
|
||||||
<ds-flex-item style="width:50px;">
|
<ds-flex-item width="20%" style="flex-grow:0;">
|
||||||
<client-only>
|
<client-only>
|
||||||
<locale-switch class="topbar-locale-switch" placement="top" offset="16" />
|
<locale-switch class="topbar-locale-switch" placement="top" offset="16" />
|
||||||
</client-only>
|
</client-only>
|
||||||
|
|||||||
@ -76,7 +76,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
layout: 'default',
|
layout: 'blank',
|
||||||
head() {
|
head() {
|
||||||
return {
|
return {
|
||||||
title: this.$t('site.changelog'),
|
title: this.$t('site.changelog'),
|
||||||
|
|||||||
@ -36,6 +36,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
|
layout: 'blank',
|
||||||
head() {
|
head() {
|
||||||
return {
|
return {
|
||||||
title: this.$t('site.code-of-conduct'),
|
title: this.$t('site.code-of-conduct'),
|
||||||
|
|||||||
@ -385,7 +385,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
layout: 'default',
|
layout: 'blank',
|
||||||
head() {
|
head() {
|
||||||
return {
|
return {
|
||||||
title: this.$t('site.data-privacy'),
|
title: this.$t('site.data-privacy'),
|
||||||
|
|||||||
@ -73,6 +73,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
|
layout: 'blank',
|
||||||
head() {
|
head() {
|
||||||
return {
|
return {
|
||||||
title: this.$t('site.imprint'),
|
title: this.$t('site.imprint'),
|
||||||
|
|||||||
@ -10,9 +10,6 @@
|
|||||||
<ds-card class="login-card">
|
<ds-card class="login-card">
|
||||||
<ds-flex gutter="small">
|
<ds-flex gutter="small">
|
||||||
<ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
|
<ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
|
||||||
<client-only>
|
|
||||||
<locale-switch class="login-locale-switch" offset="5" />
|
|
||||||
</client-only>
|
|
||||||
<ds-space margin-top="small" margin-bottom="xxx-small" centered>
|
<ds-space margin-top="small" margin-bottom="xxx-small" centered>
|
||||||
<img
|
<img
|
||||||
class="login-image"
|
class="login-image"
|
||||||
@ -53,17 +50,13 @@
|
|||||||
name="submit"
|
name="submit"
|
||||||
type="submit"
|
type="submit"
|
||||||
icon="sign-in"
|
icon="sign-in"
|
||||||
>
|
>{{ $t('login.login') }}</ds-button>
|
||||||
{{ $t('login.login') }}
|
|
||||||
</ds-button>
|
|
||||||
<ds-space margin="x-small">
|
<ds-space margin="x-small">
|
||||||
<a
|
<a
|
||||||
:href="$t('login.moreInfoURL')"
|
:href="$t('login.moreInfoURL')"
|
||||||
:title="$t('login.moreInfoHint')"
|
:title="$t('login.moreInfoHint')"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
>
|
>{{ $t('login.moreInfo') }}</a>
|
||||||
{{ $t('login.moreInfo') }}
|
|
||||||
</a>
|
|
||||||
</ds-space>
|
</ds-space>
|
||||||
</form>
|
</form>
|
||||||
</ds-flex-item>
|
</ds-flex-item>
|
||||||
@ -78,9 +71,6 @@ import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
|
|||||||
import { VERSION } from '~/constants/terms-and-conditions-version.js'
|
import { VERSION } from '~/constants/terms-and-conditions-version.js'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
|
||||||
LocaleSwitch,
|
|
||||||
},
|
|
||||||
layout: 'blank',
|
layout: 'blank',
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
layout: 'default',
|
layout: 'blank',
|
||||||
asyncData({ store, redirect }) {
|
asyncData({ store, redirect }) {
|
||||||
if (store.getters['auth/isLoggedIn']) {
|
if (store.getters['auth/isLoggedIn']) {
|
||||||
redirect('/')
|
redirect('/')
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
layout: 'default',
|
layout: 'blank',
|
||||||
head() {
|
head() {
|
||||||
return {
|
return {
|
||||||
title: this.$t('site.termsAndConditions'),
|
title: this.$t('site.termsAndConditions'),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user