diff --git a/src/assets/NcAppNavigationItem.scss b/src/assets/NcAppNavigationItem.scss index 7bd5a8a706..cda8f0094b 100644 --- a/src/assets/NcAppNavigationItem.scss +++ b/src/assets/NcAppNavigationItem.scss @@ -134,7 +134,7 @@ padding: 0; white-space: nowrap; color: var(--color-main-text); - font-weight: 500; + font-weight: var(--font-weight-element, 500); background-repeat: no-repeat; background-position: $icon-margin center; background-size: $icon-size $icon-size; @@ -157,6 +157,7 @@ max-width: 100%; white-space: nowrap; text-overflow: ellipsis; + font-weight: var(--font-weight-element, normal); } .editingContainer { diff --git a/src/assets/action.scss b/src/assets/action.scss index 7ce2721fcd..1fda1414e3 100644 --- a/src/assets/action.scss +++ b/src/assets/action.scss @@ -55,7 +55,7 @@ background-color: transparent; box-shadow: none; - font-weight: normal; + font-weight: var(--font-weight-element, normal); font-size: var(--default-font-size); line-height: var(--default-clickable-area); @@ -106,7 +106,7 @@ } &__name { - font-weight: bold; + font-weight: var(--font-weight-heading, bold); text-overflow: ellipsis; overflow: hidden; white-space: nowrap; @@ -118,6 +118,7 @@ display: block; white-space: pre-wrap; font-size: var(--font-size-small); + font-weight: var(--font-weight-default, normal); line-height: var(--default-line-height); color: var(--color-text-maxcontrast); cursor: pointer; diff --git a/src/components/NcActionInput/NcActionInput.vue b/src/components/NcActionInput/NcActionInput.vue index 52485d1eb2..01ee66f3f2 100644 --- a/src/components/NcActionInput/NcActionInput.vue +++ b/src/components/NcActionInput/NcActionInput.vue @@ -591,7 +591,7 @@ $input-margin: 4px; background-color: transparent; box-shadow: none; - font-weight: normal; + font-weight: var(--font-weight-default, normal); &__icon-wrapper { display: flex; diff --git a/src/components/NcActionTextEditable/NcActionTextEditable.vue b/src/components/NcActionTextEditable/NcActionTextEditable.vue index bcebe47774..6285b8cc79 100644 --- a/src/components/NcActionTextEditable/NcActionTextEditable.vue +++ b/src/components/NcActionTextEditable/NcActionTextEditable.vue @@ -252,7 +252,7 @@ $input-margin: 4px; background-color: transparent; box-shadow: none; - font-weight: normal; + font-weight: var(--font-weight-default, normal); line-height: var(--default-clickable-area); & > span { diff --git a/src/components/NcAppNavigationCaption/NcAppNavigationCaption.vue b/src/components/NcAppNavigationCaption/NcAppNavigationCaption.vue index 3c409057a8..fb0ac24965 100644 --- a/src/components/NcAppNavigationCaption/NcAppNavigationCaption.vue +++ b/src/components/NcAppNavigationCaption/NcAppNavigationCaption.vue @@ -266,7 +266,7 @@ export default { } &__name { - font-weight: bold; + font-weight: var(--font-weight-heading, bold); color: var(--color-main-text); font-size: var(--default-font-size); line-height: var(--default-clickable-area); diff --git a/src/components/NcAppNavigationSettings/NcAppNavigationSettings.vue b/src/components/NcAppNavigationSettings/NcAppNavigationSettings.vue index f6c657b9c9..5b2ad5345a 100644 --- a/src/components/NcAppNavigationSettings/NcAppNavigationSettings.vue +++ b/src/components/NcAppNavigationSettings/NcAppNavigationSettings.vue @@ -114,7 +114,7 @@ export default { padding-inline: 0 calc((var(--default-clickable-area) - 16px) / 2) !important; :deep(.button-vue__text) { - font-weight: normal !important; + font-weight: var(--font-weight-default, normal) !important; } } } diff --git a/src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue b/src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue index b37bb96709..4788a86cc9 100644 --- a/src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue +++ b/src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue @@ -295,7 +295,7 @@ $content-inset: calc(3 * var(--default-grid-baseline)); padding: $content-inset; margin: 0; font-size: 20px; - font-weight: 700; + font-weight: var(--font-weight-heading, 700); } :deep(.app-settings__navigation) { @@ -329,7 +329,7 @@ $content-inset: calc(3 * var(--default-grid-baseline)); display: flex; align-items: center; font-size: var(--default-font-size); - font-weight: 500; + font-weight: var(--font-weight-element, 500); height: var(--default-clickable-area); margin: 2px 0; line-height: var(--default-clickable-area); diff --git a/src/components/NcAppSettingsSection/NcAppSettingsSection.vue b/src/components/NcAppSettingsSection/NcAppSettingsSection.vue index 9a2134011a..4e09630d39 100644 --- a/src/components/NcAppSettingsSection/NcAppSettingsSection.vue +++ b/src/components/NcAppSettingsSection/NcAppSettingsSection.vue @@ -83,7 +83,7 @@ onBeforeUnmount(() => { padding-inline: var(--app-settings-section-text-offset); padding-block: 0; font-size: 20px; - font-weight: bold; + font-weight: var(--font-weight-heading, bold); } &__description { diff --git a/src/components/NcAppSidebar/NcAppSidebar.vue b/src/components/NcAppSidebar/NcAppSidebar.vue index ef6d346b5a..26a27eeeca 100644 --- a/src/components/NcAppSidebar/NcAppSidebar.vue +++ b/src/components/NcAppSidebar/NcAppSidebar.vue @@ -1539,7 +1539,7 @@ $top-buttons-spacing: $app-navigation-padding; // align with app navigation margin: 0; padding: $desc-input-padding; font-size: 20px; - font-weight: bold; + font-weight: var(--font-weight-heading, bold); } } diff --git a/src/components/NcAssistantButton/NcAssistantButton.vue b/src/components/NcAssistantButton/NcAssistantButton.vue index 109c7e0c7b..ba7ed6b66a 100644 --- a/src/components/NcAssistantButton/NcAssistantButton.vue +++ b/src/components/NcAssistantButton/NcAssistantButton.vue @@ -76,7 +76,7 @@ export default { } h5 { - font-weight: bold; + font-weight: var(--font-weight-heading, bold); margin: 40px 0 20px 0; } diff --git a/src/components/NcAvatar/NcAvatar.vue b/src/components/NcAvatar/NcAvatar.vue index 1332734d78..20c225fc4e 100644 --- a/src/components/NcAvatar/NcAvatar.vue +++ b/src/components/NcAvatar/NcAvatar.vue @@ -989,7 +989,7 @@ export default { display: block; width: 100%; text-align: center; - font-weight: normal; + font-weight: var(--font-weight-default, normal); } } diff --git a/src/components/NcBreadcrumb/NcBreadcrumb.vue b/src/components/NcBreadcrumb/NcBreadcrumb.vue index a0e109b90b..9ac8dc597c 100644 --- a/src/components/NcBreadcrumb/NcBreadcrumb.vue +++ b/src/components/NcBreadcrumb/NcBreadcrumb.vue @@ -322,7 +322,7 @@ export default { } &__text { - font-weight: normal; + font-weight: var(--font-weight-element, normal); } } :deep(.button-vue__text) { diff --git a/src/components/NcButton/NcButton.vue b/src/components/NcButton/NcButton.vue index 680517cf7a..ca5c8c6e99 100644 --- a/src/components/NcButton/NcButton.vue +++ b/src/components/NcButton/NcButton.vue @@ -169,7 +169,7 @@ export default { } h5 { - font-weight: bold; + font-weight: var(--font-weight-heading, bold); margin: 40px 0 20px 0; } @@ -404,7 +404,7 @@ td.row-size { } .table-header { - font-weight: normal; + font-weight: var(--font-weight-default, normal); color: var(--color-text-maxcontrast); } @@ -838,7 +838,7 @@ export default { transition-timing-function: linear; cursor: pointer; font-size: var(--default-font-size); - font-weight: bold; + font-weight: var(--font-weight-element, bold); &--size-small { --button-size: var(--clickable-area-small, 24px); @@ -927,7 +927,7 @@ export default { } &__text { - font-weight: bold; + font-weight: var(--font-weight-element, bold); margin-bottom: 1px; padding: 2px 0; white-space: nowrap; diff --git a/src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue b/src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue index 5b12335c34..12270fb3a2 100644 --- a/src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue +++ b/src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue @@ -262,6 +262,7 @@ export default { &__description { display: block; color: var(--color-text-maxcontrast); + font-weight: var(--font-weight-default, normal); } &--button-variant { diff --git a/src/components/NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue b/src/components/NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue index 9caea76f0a..ee8d3e07a3 100644 --- a/src/components/NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue +++ b/src/components/NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue @@ -729,6 +729,7 @@ export default { background-color: transparent; box-sizing: border-box; font-size: var(--default-font-size); + font-weight: var(--font-weight-element, normal); line-height: var(--default-line-height); padding: 0; position: relative; @@ -800,7 +801,7 @@ export default { overflow: hidden; &--checked { - font-weight: bold; + font-weight: var(--font-weight-element, bold); .checkbox-radio-switch__content { background-color: var(--color-primary-element); diff --git a/src/components/NcColorPicker/NcColorPicker.vue b/src/components/NcColorPicker/NcColorPicker.vue index 5a457fde26..a9307216df 100644 --- a/src/components/NcColorPicker/NcColorPicker.vue +++ b/src/components/NcColorPicker/NcColorPicker.vue @@ -446,7 +446,7 @@ export default { font-family: var(--font-face); font-size: var(--font-size-small, 13px); line-height: 1.5; - font-weight: 500; + font-weight: var(--font-weight-element, 500); color: var(--color-text-maxcontrast); background-color: var(--color-main-background); pointer-events: none; diff --git a/src/components/NcContent/NcContent.vue b/src/components/NcContent/NcContent.vue index 763420f261..67f6b38795 100644 --- a/src/components/NcContent/NcContent.vue +++ b/src/components/NcContent/NcContent.vue @@ -221,7 +221,7 @@ export default { } &__headline { - font-weight: bold; + font-weight: var(--font-weight-heading, bold); font-size: 20px; line-height: 30px; margin-bottom: 12px; diff --git a/src/components/NcDateTime/NcDateTime.vue b/src/components/NcDateTime/NcDateTime.vue index d2dc05109a..b42f859ce0 100644 --- a/src/components/NcDateTime/NcDateTime.vue +++ b/src/components/NcDateTime/NcDateTime.vue @@ -82,7 +82,7 @@ It is also possible to disable relative time by setting the `relativeTime` prope diff --git a/src/components/NcEmptyContent/NcEmptyContent.vue b/src/components/NcEmptyContent/NcEmptyContent.vue index 33bbee2d1d..86b7bd4619 100644 --- a/src/components/NcEmptyContent/NcEmptyContent.vue +++ b/src/components/NcEmptyContent/NcEmptyContent.vue @@ -233,7 +233,7 @@ export default { &__name { margin-bottom: 10px; text-align: center; - font-weight: bold; + font-weight: var(--font-weight-heading, bold); font-size: 20px; line-height: 30px; } diff --git a/src/components/NcFormBox/NcFormBoxItem.vue b/src/components/NcFormBox/NcFormBoxItem.vue index 7bbcee155d..ba13887454 100644 --- a/src/components/NcFormBox/NcFormBoxItem.vue +++ b/src/components/NcFormBox/NcFormBoxItem.vue @@ -109,6 +109,7 @@ const hasDescription = () => !!props.description || !!slots.description border-radius: var(--border-radius-element); background-color: var(--color-primary-element-extra-light); color: var(--color-main-text); + font-weight: var(--font-weight-element, normal); transition-property: color, border-color, background-color; transition-duration: var(--animation-quick); transition-timing-function: linear; @@ -135,6 +136,10 @@ const hasDescription = () => !!props.description || !!slots.description box-shadow: 0 0 0 4px var(--color-main-background); } + &__description { + font-weight: var(--font-weight-default, normal); + } + &.formBoxItem_legacy { --nc-form-box-item-border-width: 0px; border: none; diff --git a/src/components/NcFormGroup/NcFormGroup.vue b/src/components/NcFormGroup/NcFormGroup.vue index 53abf0fcee..a7f1b8a32b 100644 --- a/src/components/NcFormGroup/NcFormGroup.vue +++ b/src/components/NcFormGroup/NcFormGroup.vue @@ -82,7 +82,7 @@ const hasContentOnly = () => props.hideLabel && (!hasDescription() || props.hide .formGroup__label { padding-inline: var(--form-element-label-offset); font-size: var(--font-size); - font-weight: bold; + font-weight: var(--font-weight-heading, bold); } .formGroup__description { diff --git a/src/components/NcHotkeyList/NcHotkeyList.vue b/src/components/NcHotkeyList/NcHotkeyList.vue index 04616a9210..7728406bf7 100644 --- a/src/components/NcHotkeyList/NcHotkeyList.vue +++ b/src/components/NcHotkeyList/NcHotkeyList.vue @@ -37,7 +37,7 @@ const labelId = `NcHotkeyList_${createElementId()}` } .hotkeyList__heading { - font-weight: bold; + font-weight: var(--font-weight-heading, bold); margin-inline: var(--form-element-label-offset); } diff --git a/src/components/NcInputField/NcInputField.vue b/src/components/NcInputField/NcInputField.vue index 5461068bf7..bdde662509 100644 --- a/src/components/NcInputField/NcInputField.vue +++ b/src/components/NcInputField/NcInputField.vue @@ -519,7 +519,7 @@ export default { line-height: 1.5; // minimum allowed line height for accessibility // 1.5 * font-size = line-height; line-height / 2 for centering and make it negative as we need to move outside the element inset-block-start: calc(-1.5 * var(--input-label-font-size) / 2); - font-weight: 500; + font-weight: var(--font-weight-element, 500); border-radius: var(--default-grid-baseline) var(--default-grid-baseline) 0 0; background-color: var(--color-main-background); padding-inline: var(--default-grid-baseline); diff --git a/src/components/NcKbd/NcKbd.vue b/src/components/NcKbd/NcKbd.vue index 1a94b9dd53..126b2b2d69 100644 --- a/src/components/NcKbd/NcKbd.vue +++ b/src/components/NcKbd/NcKbd.vue @@ -209,7 +209,7 @@ OS detection is automatic but can be overridden via the `mac` prop. border-block-end: 2px solid var(--color-border); th { - font-weight: bold; + font-weight: var(--font-weight-heading, bold); } } } diff --git a/src/components/NcListItem/NcListItem.vue b/src/components/NcListItem/NcListItem.vue index 13b7f807d6..247038a310 100644 --- a/src/components/NcListItem/NcListItem.vue +++ b/src/components/NcListItem/NcListItem.vue @@ -906,7 +906,7 @@ export default { .list-item-content__name { min-width: 100px; flex: 1 1 10%; - font-weight: 500; + font-weight: var(--font-weight-element, 500); } .list-item-content__subname { @@ -914,7 +914,7 @@ export default { min-width: 0; color: var(--color-text-maxcontrast); &--bold { - font-weight: 500; + font-weight: var(--font-weight-element, 500); } } @@ -1048,7 +1048,7 @@ export default { &__details { color: var(--color-text-maxcontrast); margin: 0 9px !important; - font-weight: normal; + font-weight: var(--font-weight-default, normal); } &__extra { margin: 2px 4px 0 4px; diff --git a/src/components/NcNoteCard/NcNoteCard.vue b/src/components/NcNoteCard/NcNoteCard.vue index 1592aa40ef..c9393f718c 100644 --- a/src/components/NcNoteCard/NcNoteCard.vue +++ b/src/components/NcNoteCard/NcNoteCard.vue @@ -181,7 +181,7 @@ export default { &__heading { font-size: var(--note-card-icon-size); // Same as icon - font-weight: 600; + font-weight: var(--font-weight-heading, 600); } &__icon { diff --git a/src/components/NcRadioGroupButton/NcRadioGroupButton.vue b/src/components/NcRadioGroupButton/NcRadioGroupButton.vue index b2806ad1aa..51aba361bd 100644 --- a/src/components/NcRadioGroupButton/NcRadioGroupButton.vue +++ b/src/components/NcRadioGroupButton/NcRadioGroupButton.vue @@ -135,7 +135,7 @@ function onUpdate() { } .radioGroupButton__label { - font-weight: bold; + font-weight: var(--font-weight-element, bold); } .radioGroupButton_disabled { diff --git a/src/components/NcRelatedResourcesPanel/NcRelatedResourcesPanel.vue b/src/components/NcRelatedResourcesPanel/NcRelatedResourcesPanel.vue index e3be40d565..cc910f0ae1 100644 --- a/src/components/NcRelatedResourcesPanel/NcRelatedResourcesPanel.vue +++ b/src/components/NcRelatedResourcesPanel/NcRelatedResourcesPanel.vue @@ -261,7 +261,7 @@ export default { &__header { h5 { - font-weight: bold; + font-weight: var(--font-weight-heading, bold); margin-bottom: 6px; } diff --git a/src/components/NcRelatedResourcesPanel/NcResource.vue b/src/components/NcRelatedResourcesPanel/NcResource.vue index 081ca628c9..55315fc227 100644 --- a/src/components/NcRelatedResourcesPanel/NcResource.vue +++ b/src/components/NcRelatedResourcesPanel/NcResource.vue @@ -86,7 +86,7 @@ export default { justify-content: flex-start !important; .button-vue__text { - font-weight: normal !important; + font-weight: var(--font-weight-default, normal) !important; margin-left: 2px !important; } } diff --git a/src/components/NcRelatedResourcesPanel/NcTeamResources.vue b/src/components/NcRelatedResourcesPanel/NcTeamResources.vue index 1583dfcfd6..2c6162b0ab 100644 --- a/src/components/NcRelatedResourcesPanel/NcTeamResources.vue +++ b/src/components/NcRelatedResourcesPanel/NcTeamResources.vue @@ -201,7 +201,7 @@ export default {