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

fix(header-alignment): Fix logo and locale position.

Browse Source
This commit is contained in:
gha-gozu 2019-08-18 21:04:56 +07:00 committed by mattwr18
parent a01c73536f
commit 7fdabd9ac4
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -47,7 +47,7 @@ services:
networks: networks:
- hc-network - hc-network
ports: ports:
- 80:80 - 8001:8001
networks: networks:
hc-network: hc-network:

26
webapp/layouts/default.vue
View File

@ -3,8 +3,8 @@
<div class="main-navigation"> <div class="main-navigation">
<ds-container class="main-navigation-container" style="padding: 10px 10px;"> <ds-container class="main-navigation-container" style="padding: 10px 10px;">
<div> <div>
<ds-flex class="main-navigation-flex" centered> <ds-flex class="main-navigation-flex">
<ds-flex-item :width="{ lg: '3.5%' }" /> <ds-flex-item :width="{ lg: '30%' }" />
<ds-flex-item :width="{ base: '80%', sm: '80%', md: '80%', lg: '15%' }"> <ds-flex-item :width="{ base: '80%', sm: '80%', md: '80%', lg: '15%' }">
<nuxt-link :to="{ name: 'index' }"> <nuxt-link :to="{ name: 'index' }">
<ds-logo /> <ds-logo />
@ -17,7 +17,7 @@
<ds-button icon="bars" @click="toggleMobileMenuView" right /> <ds-button icon="bars" @click="toggleMobileMenuView" right />
</ds-flex-item> </ds-flex-item>
<ds-flex-item <ds-flex-item
:width="{ base: '85%', sm: '85%', md: '50%', lg: '50%' }" :width="{ base: '85%', sm: '85%', md: '50%', lg: '20%' }"
:class="{ 'hide-mobile-menu': !toggleMobileMenu }" :class="{ 'hide-mobile-menu': !toggleMobileMenu }"
> >
<div id="nav-search-box" v-if="isLoggedIn"> <div id="nav-search-box" v-if="isLoggedIn">
@ -88,9 +88,11 @@
{{ $t('login.hello') }} {{ $t('login.hello') }}
<b>{{ userName }}</b> <b>{{ userName }}</b>
<template v-if="user.role !== 'user'"> <template v-if="user.role !== 'user'">
<ds-text color="softer" size="small" style="margin-bottom: 0"> <ds-text
{{ user.role | camelCase }} color="softer"
</ds-text> size="small"
style="margin-bottom: 0"
>{{ user.role | camelCase }}</ds-text>
</template> </template>
<hr /> <hr />
<ds-menu :routes="routes" :matcher="matcher"> <ds-menu :routes="routes" :matcher="matcher">
@ -129,14 +131,10 @@
<div id="footer" class="ds-footer"> <div id="footer" class="ds-footer">
<a href="https://human-connection.org" target="_blank" v-html="$t('site.made')"></a> <a href="https://human-connection.org" target="_blank" v-html="$t('site.made')"></a>
&nbsp;-&nbsp; &nbsp;-&nbsp;
<nuxt-link to="/imprint">{{ $t('site.imprint') }}</nuxt-link> <nuxt-link to="/imprint">{{ $t('site.imprint') }}</nuxt-link>&nbsp;‑&nbsp;
&nbsp;‑&nbsp; <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link>&nbsp;‑&nbsp;
<nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link> <nuxt-link to="/code-of-conduct">{{ $t('site.code-of-conduct') }}</nuxt-link>&nbsp;‑&nbsp;
&nbsp;‑&nbsp; <nuxt-link to="/data-privacy">{{ $t('site.data-privacy') }}</nuxt-link>&nbsp;‑&nbsp;
<nuxt-link to="/code-of-conduct">{{ $t('site.code-of-conduct') }}</nuxt-link>
&nbsp;‑&nbsp;
<nuxt-link to="/data-privacy">{{ $t('site.data-privacy') }}</nuxt-link>
&nbsp;‑&nbsp;
<nuxt-link to="/changelog">{{ $t('site.changelog') }}</nuxt-link> <nuxt-link to="/changelog">{{ $t('site.changelog') }}</nuxt-link>
</div> </div>
<div id="overlay" /> <div id="overlay" />