Skip to content

Commit

Permalink
fix(nc-gui): pr review changes
Browse files Browse the repository at this point in the history
  • Loading branch information
DarkPhoenix2704 committed Mar 16, 2024
1 parent cc40eb0 commit 27d3b8e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -398,9 +398,7 @@ onMounted(() => {
<span>
{{ $t('activity.toBase') }}
</span>
<span
class="flex text-gray-600 items-center py-1 px-2 h-[1.75rem] gap-2 border-1 rounded-lg border-gray-200 text-md"
>
<span class="flex text-gray-600 items-center py-1 px-2 h-[1.75rem] gap-2 bg-gray-100 rounded-lg text-md">
<GeneralProjectIcon
:color="parseProp(base.meta).iconColor"
:type="base.type"
Expand All @@ -418,7 +416,7 @@ onMounted(() => {
</div>
<NcTooltip>
<template #title>{{ $t('labels.enterMultipleEmails') }} </template>
<component :is="iconMap.info" class="text-gray-700" />
<component :is="iconMap.info" class="text-gray-500" />
</NcTooltip>
</div>
<div class="flex flex-col">
Expand All @@ -427,7 +425,7 @@ onMounted(() => {
:class="{
'border-gray-200': isDivFocused,
}"
class="flex py-2 px-4 border-1 gap-1 items-center max-h-46 flex-wrap rounded-lg nc-scrollbar-md"
class="flex py-2 px-2 border-1 gap-1 items-center max-h-46 flex-wrap rounded-lg nc-scrollbar-md"
tabindex="0"
@blur="isDivFocused = false"
@click="focusOnDiv"
Expand Down Expand Up @@ -477,7 +475,7 @@ onMounted(() => {
{{ $t('activity.enablePublicAccess') }}
</span>

<span class="flex items-center py-1 px-2 h-[1.75rem] gap-2 border-1 rounded-lg border-gray-200 text-md">
<span class="flex items-center py-1 px-2 h-[1.75rem] gap-2 rounded-lg bg-gray-100 text-md">
<GeneralProjectIcon
:color="parseProp(base.meta).iconColor"
:type="base.type"
Expand All @@ -504,7 +502,7 @@ onMounted(() => {
<GeneralCopyUrl
v-model:url="url"
:class="{
'w-135': props.isView,
'w-[34.625rem]': props.isView,
}"
/>
<div v-if="!appInfo.ee" class="flex flex-row gap-3 items-center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,8 @@ const openManageAccess = async () => {
</div>

<div v-if="isPublicShared" class="space-y-3">
<GeneralCopyUrl v-model:url="url" class="w-138" />
<div class="flex items-center h-8 justify-between">
<GeneralCopyUrl v-model:url="url" class="w-[34.625rem]" />
<div class="flex items-center gap-3 h-8 justify-between">
<div class="flex flex-row gap-3 items-center">
<a-switch
v-e="['c:share:view:password:toggle']"
Expand All @@ -395,7 +395,7 @@ const openManageAccess = async () => {
v-if="passwordProtected"
v-model:value="password"
:placeholder="$t('placeholder.password.enter')"
class="!rounded-lg !focus:border-brand-500 !w-72 !focus:ring-0 !focus:shadow-none !border-gray-200 !py-1 !bg-white"
class="!rounded-lg flex-1 !focus:border-brand-500 !w-72 !focus:ring-0 !focus:shadow-none !border-gray-200 !py-1 !bg-white"
data-testid="nc-modal-share-view__password"
size="small"
type="password"
Expand Down Expand Up @@ -434,7 +434,7 @@ const openManageAccess = async () => {
</div>
<NcTooltip>
<template #title>{{ $t('tooltip.surveyFormInfo') }} </template>
<component :is="iconMap.info" class="text-gray-700" />
<component :is="iconMap.info" class="text-gray-500" />
</NcTooltip>
</div>
Expand Down Expand Up @@ -487,7 +487,7 @@ const openManageAccess = async () => {
</div>
<NcTooltip>
<template #title>{{ $t('tooltip.preFillFormInfo') }} </template>
<component :is="iconMap.info" class="text-gray-700" />
<component :is="iconMap.info" class="text-gray-500" />
</NcTooltip>
</div>
</template>
Expand Down
6 changes: 2 additions & 4 deletions packages/nc-gui/components/dlg/share-and-collaborate/View.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,12 @@ watch(activeTab, () => {
:style="{
filter: activeTab !== 'base' ? 'grayscale(100%) brightness(115%)' : '',
}"
class="nc-view-icon transition-all w-8 h-8 group-hover"
class="nc-view-icon transition-all w-6 h-6 group-hover"
/>
<span
:class="{
'font-semibold': activeTab === 'base',
}"
class="text-base"
>
Base
</span>
Expand All @@ -109,13 +108,12 @@ watch(activeTab, () => {
'text-gray-500': activeTab !== 'view',
}"
:style="{ color: activeTab === 'view' ? viewIcons[view?.type]?.color : '' }"
class="nc-view-icon transition-all !text-[32px] group-hover"
class="nc-view-icon transition-all !text-2xl group-hover"
/>
<span
:class="{
'font-semibold': activeTab === 'view',
}"
class="text-base"
>
View
</span>
Expand Down

0 comments on commit 27d3b8e

Please sign in to comment.