Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/assets/NcAppNavigationItem.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -157,6 +157,7 @@
max-width: 100%;
white-space: nowrap;
text-overflow: ellipsis;
font-weight: var(--font-weight-element, normal);
}

.editingContainer {
Expand Down
5 changes: 3 additions & 2 deletions src/assets/action.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -106,7 +106,7 @@
}

&__name {
font-weight: bold;
font-weight: var(--font-weight-heading, bold);
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcActionInput/NcActionInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
/**
* id attribute of the checkbox element
*/
id: {

Check warning on line 297 in src/components/NcActionInput/NcActionInput.vue

View workflow job for this annotation

GitHub Actions / eslint

'id' of property found, but never used
type: String,
default: () => 'action-' + GenRandomId(),
validator: (id) => id.trim() !== '',
Expand Down Expand Up @@ -382,7 +382,7 @@
*
* @deprecated
*/
value: {

Check warning on line 385 in src/components/NcActionInput/NcActionInput.vue

View workflow job for this annotation

GitHub Actions / eslint

'value' of property found, but never used
type: [String, Date, Number, Array],
default: undefined,
},
Expand All @@ -390,7 +390,7 @@
/**
* value attribute of the input field
*/
modelValue: {

Check warning on line 393 in src/components/NcActionInput/NcActionInput.vue

View workflow job for this annotation

GitHub Actions / eslint

'modelValue' of property found, but never used
type: [String, Date, Number, Array],
default: '',
},
Expand All @@ -406,13 +406,13 @@
/**
* aria-label attribute of the input field
*/
ariaLabel: {

Check warning on line 409 in src/components/NcActionInput/NcActionInput.vue

View workflow job for this annotation

GitHub Actions / eslint

'ariaLabel' of property found, but never used
type: String,
default: '',
},

/**
* @deprecated To be removed in @nextcloud/vue 9. Migration guide: remove ariaHidden prop from NcAction* components.

Check warning on line 415 in src/components/NcActionInput/NcActionInput.vue

View workflow job for this annotation

GitHub Actions / eslint

Unexpected inline JSDoc tag. Did you mean to use {@nextcloud}, \@nextcloud, or `@nextcloud`?
* @todo Add a check in @nextcloud/vue 9 that this prop is not provided,
* otherwise root element will inherit incorrect aria-hidden.
*/
Expand Down Expand Up @@ -591,7 +591,7 @@
background-color: transparent;
box-shadow: none;

font-weight: normal;
font-weight: var(--font-weight-default, normal);

&__icon-wrapper {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcAppSidebar/NcAppSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/NcAssistantButton/NcAssistantButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default {
}

h5 {
font-weight: bold;
font-weight: var(--font-weight-heading, bold);
margin: 40px 0 20px 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/NcAvatar/NcAvatar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ export default {
display: block;
width: 100%;
text-align: center;
font-weight: normal;
font-weight: var(--font-weight-default, normal);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/NcBreadcrumb/NcBreadcrumb.vue
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ export default {
}

&__text {
font-weight: normal;
font-weight: var(--font-weight-element, normal);
}
}
:deep(.button-vue__text) {
Expand Down
8 changes: 4 additions & 4 deletions src/components/NcButton/NcButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export default {
}

h5 {
font-weight: bold;
font-weight: var(--font-weight-heading, bold);
margin: 40px 0 20px 0;
}

Expand Down Expand Up @@ -404,7 +404,7 @@ td.row-size {
}

.table-header {
font-weight: normal;
font-weight: var(--font-weight-default, normal);
color: var(--color-text-maxcontrast);
}

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ export default {
&__description {
display: block;
color: var(--color-text-maxcontrast);
font-weight: var(--font-weight-default, normal);
}

&--button-variant {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcColorPicker/NcColorPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcContent/NcContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcDateTime/NcDateTime.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ It is also possible to disable relative time by setting the `relativeTime` prope
</script>
<style>
h4 {
font-weight: bold;
font-weight: var(--font-weight-heading, bold);
margin-top: 12px;
}
</style>
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcEmptyContent/NcEmptyContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
5 changes: 5 additions & 0 deletions src/components/NcFormBox/NcFormBoxItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcFormGroup/NcFormGroup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcHotkeyList/NcHotkeyList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
</style>
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcInputField/NcInputField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcKbd/NcKbd.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/NcListItem/NcListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -906,15 +906,15 @@ 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 {
flex: 1 0;
min-width: 0;
color: var(--color-text-maxcontrast);
&--bold {
font-weight: 500;
font-weight: var(--font-weight-element, 500);
}
}

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcNoteCard/NcNoteCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcRadioGroupButton/NcRadioGroupButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ function onUpdate() {
}

.radioGroupButton__label {
font-weight: bold;
font-weight: var(--font-weight-element, bold);
}

.radioGroupButton_disabled {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ export default {
&__header {

h5 {
font-weight: bold;
font-weight: var(--font-weight-heading, bold);
margin-bottom: 6px;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/NcRelatedResourcesPanel/NcResource.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/components/NcRelatedResourcesPanel/NcTeamResources.vue
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ export default {

<style lang="scss" scoped>
.team-resources__header {
font-weight: bold;
font-weight: var(--font-weight-heading, bold);
margin-bottom: 6px;
}

Expand All @@ -227,23 +227,23 @@ export default {
align-items: center;
gap: 12px;
padding: 6px 12px;
font-weight: bold;
font-weight: var(--font-weight-heading, bold);
margin: 0;
}

.related-team-provider {
padding: 6px 12px;

&__name {
font-weight: bold;
font-weight: var(--font-weight-heading, bold);
margin-bottom: 3px;
}

&__link {
display: flex;
gap: 12px;
padding: 6px 12px;
font-weight: bold;
font-weight: var(--font-weight-heading, bold);
}
}

Expand Down
Loading
Loading