Skip to content

fix(comments): move new comment instructions placeholder to description #40294

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
ShGKme merged 2 commits into from
Oct 7, 2023
Merged

fix(comments): move new comment instructions placeholder to description #40294

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be8d904
fix(comments): move new comment instructions placeholder to description
ShGKme Sep 6, 2023
0ce5a34
chore(assets): Re-compile assets
ShGKme Oct 7, 2023
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
Next Next commit
fix(comments): move new comment instructions placeholder to description 
Signed-off-by: Grigorii K. Shartsev <[email protected]>
  • Loading branch information
@ShGKme
ShGKme committed Oct 7, 2023
commit be8d9042b539fea6dabc93be5b285aa40d87046f
61 changes: 37 additions & 24 deletions apps/comments/src/components/Comment.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,26 +68,33 @@
</div>

<!-- Message editor -->
<div v-if="editor || editing" class="comment__editor ">
<NcRichContenteditable ref="editor"
:auto-complete="autoComplete"
:contenteditable="!loading"
:value="localMessage"
:user-data="userData"
@update:value="updateLocalMessage"
@submit="onSubmit" />
<NcButton class="comment__submit"
type="tertiary-no-background"
native-type="submit"
:aria-label="t('comments', 'Post comment')"
:disabled="isEmptyMessage"
@click="onSubmit">
<template #icon>
<span v-if="loading" class="icon-loading-small" />
<ArrowRight v-else :size="20" />
</template>
</NcButton>
</div>
<form v-if="editor || editing" class="comment__editor" @submit.prevent>
<div class="comment__editor-group">
<NcRichContenteditable ref="editor"
:auto-complete="autoComplete"
:contenteditable="!loading"
:value="localMessage"
:user-data="userData"
aria-describedby="tab-comments__editor-description"
@update:value="updateLocalMessage"
@submit="onSubmit" />
<div class="comment__submit">
<NcButton type="tertiary-no-background"
native-type="submit"
:aria-label="t('comments', 'Post comment')"
:disabled="isEmptyMessage"
@click="onSubmit">
<template #icon>
<span v-if="loading" class="icon-loading-small" />
<ArrowRight v-else :size="20" />
</template>
</NcButton>
</div>
</div>
<div id="tab-comments__editor-description" class="comment__editor-description">
{{ t('comments', '"@" for mentions, ":" for emoji, "/" for smart picker') }}
</div>
</form>

<!-- Message content -->
<!-- The html is escaped and sanitized before rendering -->
Expand Down Expand Up @@ -273,7 +280,6 @@ $comment-padding: 10px;
.comment {
display: flex;
gap: 16px;
position: relative;
padding: 5px $comment-padding;

&__side {
Expand Down Expand Up @@ -313,12 +319,19 @@ $comment-padding: 10px;
color: var(--color-text-maxcontrast);
}

&__editor-group {
position: relative;
}

&__editor-description {
color: var(--color-text-maxcontrast);
padding-block: var(--default-grid-baseline);
}

&__submit {
position: absolute !important;
right: 0;
bottom: 0;
// Align with input border
margin: 1px;
right: 0;
}

&__message {
Expand Down
7 changes: 5 additions & 2 deletions apps/comments/src/views/Comments.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,13 @@ export default {

<style lang="scss" scoped>
.comments {
// Do not add emptycontent top margin
min-height: 100%;
display: flex;
flex-direction: column;

&__empty,
&__error {
margin-top: 0 !important;
flex: 1 0;
}

&__retry {
Expand Down