From b38655b91cc76c1adcd8c12a78369bddf1aa6f50 Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 2 Jun 2019 17:29:50 -0400 Subject: [PATCH] fix: links-list + page logo alignment --- client/components/common/nav-header.vue | 42 +++++++++++++++++++++---- client/themes/default/scss/app.scss | 31 +++++++++++++++++- 2 files changed, 66 insertions(+), 7 deletions(-) diff --git a/client/components/common/nav-header.vue b/client/components/common/nav-header.vue index e2b2861a..27506b2f 100644 --- a/client/components/common/nav-header.vue +++ b/client/components/common/nav-header.vue @@ -19,7 +19,7 @@ v-layout(row) v-flex(xs6, :md4='searchIsShown', :md6='!searchIsShown') v-toolbar.nav-header-inner(color='black', dark, flat) - v-menu(open-on-hover, offset-y, bottom, left, min-width='250') + v-menu(open-on-hover, offset-y, bottom, left, min-width='250', transition='slide-y-transition') v-toolbar-side-icon.btn-animate-app(slot='activator') v-icon view_module v-list(dense, :light='!$vuetify.dark', :dark='$vuetify.dark', :class='$vuetify.dark ? `grey darken-4` : ``').py-0 @@ -137,11 +137,22 @@ icon ) v-icon(color='grey') search + //- v-menu(offset-y, left, transition='slide-y-transition') + //- v-tooltip(bottom, slot='activator') + //- v-btn(icon, slot='activator') + //- v-icon(color='grey') language + //- span Language + //- v-list.py-0 + //- template(v-for='(lc, idx) of locales') + //- v-list-tile(@click='changeLocale(lc)') + //- v-list-tile-action: v-chip(:color='lc.code === $i18n.i18next.language ? `blue` : `grey`', small, label, dark) {{lc.code.toUpperCase()}} + //- v-list-tile-title {{lc.name}} + //- v-divider.my-0(v-if='idx < locales.length - 1') v-tooltip(bottom, v-if='isAuthenticated && isAdmin') v-btn.btn-animate-rotate(icon, href='/a', slot='activator') v-icon(color='grey') settings span Admin - v-menu(v-if='isAuthenticated', offset-y, min-width='300', left) + v-menu(v-if='isAuthenticated', offset-y, min-width='300', left, transition='slide-y-transition') v-tooltip(bottom, slot='activator') v-btn(icon, slot='activator', outline, color='blue') v-icon(v-if='picture.kind === `initials`', color='grey') account_circle @@ -159,11 +170,11 @@ v-list-tile-title {{name}} v-list-tile-sub-title {{email}} v-divider.my-0 - v-list-tile(href='/w') + v-list-tile(href='/w', disabled) v-list-tile-action: v-icon(color='blue') web v-list-tile-title My Wiki v-divider.my-0 - v-list-tile(href='/p') + v-list-tile(href='/p', disabled) v-list-tile-action: v-icon(color='blue') person v-list-tile-title Profile v-divider.my-0 @@ -205,7 +216,12 @@ export default { searchIsShown: true, searchAdvMenuShown: false, newPageModal: false, - deletePageModal: false + deletePageModal: false, + locales: [ + { code: 'en', name: 'English' }, + { code: 'fr', name: 'Français' }, + { code: 'es', name: 'Español' } + ] } }, computed: { @@ -304,7 +320,21 @@ export default { this.deletePageModal = true }, assets () { - window.location.assign(`/f`) + // window.location.assign(`/f`) + this.$store.commit('showNotification', { + style: 'indigo', + message: `Coming soon...`, + icon: 'directions_boat' + }) + }, + async changeLocale(locale) { + await this.$i18n.i18next.changeLanguage(locale.code) + switch (this.mode) { + case 'view': + case 'history': + window.location.assign(`/${locale.code}/${this.path}`) + break + } }, logout () { Cookies.remove('jwt') diff --git a/client/themes/default/scss/app.scss b/client/themes/default/scss/app.scss index b505882a..25948b76 100644 --- a/client/themes/default/scss/app.scss +++ b/client/themes/default/scss/app.scss @@ -151,6 +151,11 @@ margin-right: .5rem; } + &.valign-center > p { + display: flex; + align-items: center; + } + &.is-info { background-color: mc('blue', '50'); background-image: radial-gradient(ellipse at top, mc('blue', '50'), lighten(mc('blue', '50'), 5%)); @@ -265,6 +270,28 @@ text-decoration: none; margin: -1rem; padding: 1rem; + + > em { + font-weight: 400; + font-style: normal; + color: mc('grey', '700'); + display: inline-block; + padding-left: .5rem; + border-left: 1px solid mc('grey', '300'); + margin-left: .5rem; + + &.is-block { + display: block; + padding-left: 0; + margin-left: 0; + border-left: none; + } + } + } + + > em { + font-weight: 400; + font-style: normal; } @at-root .theme--dark & { @@ -481,8 +508,10 @@ } &.align-abstopright { position: absolute; - top: -80px; + top: -90px; right: 1rem; + height: calc(90px - 2rem); + width: auto; } &.decor-shadow { box-shadow: 0 3px 8px 0 rgba(116, 129, 141, 0.1);