Skip to content

[stable34] fix(guest): replace 'Log in' button with a link #18059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Antreesy merged 1 commit into from
May 22, 2026
Merged

[stable34] fix(guest): replace 'Log in' button with a link #18059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions src/components/GuestWelcomeWindow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,12 @@

<div class="separator" />

<div class="login-info">
<span> {{ t('spreed', 'Do you already have an account?') }}</span>
<NcButton
variant="secondary"
:href="getLoginUrl()">
<p class="login-info">
{{ t('spreed', 'Do you already have an account?') }}
<a :href="getLoginUrl()">
{{ t('spreed', 'Log in') }}
</NcButton>
</div>
</a>
</p>
</div>
</NcModal>
</template>
Expand Down Expand Up @@ -158,10 +156,11 @@ export default {
}

.login-info {
display: flex;
align-items: center;
gap: calc(var(--default-grid-baseline) * 2);
padding-top: calc(var(--default-grid-baseline) * 2);

&__link {
text-decoration: underline;
}
}

.separator {
Expand Down
41 changes: 18 additions & 23 deletions src/components/SetGuestUsername.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@
<!-- eslint-disable-next-line vue/no-v-html -->
<h3 v-if="!compact" v-html="displayNameLabel" />

<NcButton
v-if="!isEditingUsername && !compact"
@click="toggleEdit">
{{ t('spreed', 'Edit display name') }}
<template #icon>
<IconPencilOutline :size="20" />
</template>
</NcButton>

<div v-else class="username-form__display-name">
<div class="username-form__display-name">
<IconAccountOutline class="username-form__display-name-icon" :size="20" />

<NcButton
v-if="!isEditingUsername && !compact"
@click="toggleEdit">
{{ t('spreed', 'Edit display name') }}
<template #icon>
<IconPencilOutline :size="20" />
</template>
</NcButton>
<NcTextField
v-else
ref="usernameInput"
v-model="guestUserName"
:placeholder="t('spreed', 'Guest')"
Expand All @@ -33,15 +34,12 @@
@keydown.esc="toggleEdit" />
</div>

<div class="login-info">
<span> {{ t('spreed', 'Do you already have an account?') }}</span>
<NcButton
class="login-info__button"
variant="secondary"
:href="loginUrl">
<p class="login-info">
{{ t('spreed', 'Do you already have an account?') }}
<a class="login-info__link" :href="loginUrl">
{{ t('spreed', 'Log in') }}
</NcButton>
</div>
</a>
</p>
</div>
</template>

Expand Down Expand Up @@ -167,14 +165,11 @@ function toggleEdit() {
}

.login-info {
display: flex;
align-items: center;
gap: calc(var(--default-grid-baseline) * 2);
padding: calc(var(--default-grid-baseline) * 2) calc(var(--default-grid-baseline) * 2) 0;
margin-inline-start: calc(var(--default-grid-baseline) + 20px); // 20px for checkbox alignment

&__button {
flex-shrink: 0;
&__link {
text-decoration: underline;
}
}

Expand Down
Loading