Skip to content

[stable8] fix(NcHotkeyList): align with form labels #7810

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
merged 2 commits into from
Nov 7, 2025
Merged

[stable8] fix(NcHotkeyList): align with form labels #7810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0678b2a
chore(NcAppSettingsDialog): add shortcuts to the example
ShGKme Nov 7, 2025
eadb110
fix(NcHotkeyList): align with form labels
ShGKme Nov 7, 2025
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
15 changes: 15 additions & 0 deletions src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,21 @@ export default {
<NcAppSettingsSection id="about" name="About">
<NcFormGroup label="Acknowledgements" description="This application includes CKEditor, an open-source editor. Copyright (C) CKEditor contributors. Licensed under GPLv2." />
</NcAppSettingsSection>

<NcAppSettingsSectionShortcuts>
<NcHotkeyList>
<NcHotkey label="Compose new message" hotkey="C" />
<NcHotkey label="Newer message" hotkey="ArrowLeft" />
<NcHotkey label="Older message" hotkey="ArrowRight" />
<NcHotkey label="Toggle star" hotkey="S" />
<NcHotkey label="Toggle unread" hotkey="U" />
<NcHotkey label="Archive" hotkey="A" />
<NcHotkey label="Delete" hotkey="Delete" />
<NcHotkey label="Search" hotkey="Control F" />
<NcHotkey label="Send" hotkey="Control Enter" />
<NcHotkey label="Refresh" hotkey="R" />
</NcHotkeyList>
</NcAppSettingsSectionShortcuts>
</NcAppSettingsDialog>
</div>
</template>
Expand Down
3 changes: 2 additions & 1 deletion src/components/NcHotkey/NcHotkey.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ const NO_LABEL_WARNING = '⚠️ NcHotKey must have a label or slot content'

<style lang="scss" module>
.hotkey {
--form-element-label-offset: calc(var(--border-radius-element) + var(--default-grid-baseline));
display: flex;
flex-direction: row-reverse;
align-items: stretch;
padding-inline: var(--border-radius-element); /* Align with form group */
padding-inline: var(--form-element-label-offset);

&:first-child {
.hotkey__label,
Expand Down
3 changes: 2 additions & 1 deletion src/components/NcHotkeyList/NcHotkeyList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ const labelId = `NcHotkeyList_${createElementId()}`

<style module>
.hotkeyList {
--form-element-label-offset: calc(var(--border-radius-element) + var(--default-grid-baseline));
/* Too wide list is less readable - 400px seems a good width */
max-width: 400px;
}

.hotkeyList__heading {
font-weight: bold;
margin-inline: var(--border-radius-element); /* Align with form group */
margin-inline: var(--form-element-label-offset);
}
</style>

Expand Down
Loading