Browse Source

Merge branch 'develop' into fix/gui-v2-shared-base-issues

pull/3234/head
Wing-Kam Wong 2 years ago
parent
commit
8247536029
  1. 7
      packages/nc-gui-v2/components/general/Language.vue
  2. 2
      packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue
  3. 8
      packages/nc-gui-v2/layouts/base.vue

7
packages/nc-gui-v2/components/general/Language.vue

@ -50,15 +50,12 @@ onMounted(() => {
:value="lang" :value="lang"
@click="changeLanguage(lang)" @click="changeLanguage(lang)"
> >
<div <div :class="lang === locale ? '!font-semibold !text-primary' : ''" class="nc-project-menu-item capitalize">
:class="lang === locale ? '!font-semibold !text-primary' : ''"
class="nc-project-menu-item capitalize group-hover:text-pink-500"
>
{{ Language[lang] || lang }} {{ Language[lang] || lang }}
</div> </div>
</a-menu-item> </a-menu-item>
<a-menu-item> <a-menu-item class="mt-1">
<a <a
href="https://docs.nocodb.com/engineering/translation/#how-to-contribute--for-community-members" href="https://docs.nocodb.com/engineering/translation/#how-to-contribute--for-community-members"
target="_blank" target="_blank"

2
packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue

@ -147,7 +147,7 @@ function onStopEdit() {
<template> <template>
<a-menu-item <a-menu-item
class="select-none group !flex !items-center !my-0" class="select-none group !flex !items-center !my-0"
@dblclick.stop="isUIAllowed('virtualViewsCreateOrEdit') && onDblClick" @dblclick.stop="isUIAllowed('virtualViewsCreateOrEdit') && onDblClick()"
@click.stop="onClick" @click.stop="onClick"
> >
<div v-t="['a:view:open', { view: vModel.type }]" class="text-xs flex items-center w-full gap-2"> <div v-t="['a:view:open', { view: vModel.type }]" class="text-xs flex items-center w-full gap-2">

8
packages/nc-gui-v2/layouts/base.vue

@ -68,17 +68,17 @@ const logout = () => {
<nuxt-link v-t="['c:navbar:user:email']" class="nc-project-menu-item group no-underline" to="/user"> <nuxt-link v-t="['c:navbar:user:email']" class="nc-project-menu-item group no-underline" to="/user">
<MdiAt class="mt-1 group-hover:text-pink-500" />&nbsp; <MdiAt class="mt-1 group-hover:text-pink-500" />&nbsp;
<span class="prose">{{ email }}</span> <span class="prose group-hover:text-primary"> {{ email }}</span>
</nuxt-link> </nuxt-link>
</a-menu-item> </a-menu-item>
<a-menu-divider class="!m-0" /> <a-menu-divider class="!m-0" />
<a-menu-item key="1" class="!rounded-b"> <a-menu-item key="1" class="!rounded-b group">
<div v-t="['a:navbar:user:sign-out']" class="nc-project-menu-item group" @click="logout"> <div v-t="['a:navbar:user:sign-out']" class="nc-project-menu-item group" @click="logout">
<MdiLogout class="group-hover:(!text-pink-500)" />&nbsp; <MdiLogout class="group-hover:text-pink-500" />&nbsp;
<span class="prose"> <span class="prose group-hover:text-primary">
{{ $t('general.signOut') }} {{ $t('general.signOut') }}
</span> </span>
</div> </div>

Loading…
Cancel
Save