Skip to content

refactor(NcButton, NcNoteCard): use status text color for icons and text #7300

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 1 commit into from
Aug 19, 2025
Merged

refactor(NcButton, NcNoteCard): use status text color for icons and text #7300

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
15 changes: 8 additions & 7 deletions src/components/NcButton/NcButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ function onClick(event: MouseEvent) {
--button-size: var(--default-clickable-area);
--button-inner-size: calc(var(--button-size) - 4px); // without the outer border
--button-radius: var(--border-radius-element);
--button-padding-default: min(calc(var(--default-grid-baseline) + var(--button-radius)), calc(var(--default-grid-baseline) * 4));
--button-padding-default: calc(var(--default-grid-baseline) + var(--button-radius));
--button-padding: var(--default-grid-baseline) var(--button-padding-default);

// General styles
Expand All @@ -727,8 +727,8 @@ function onClick(event: MouseEvent) {
overflow: hidden;
padding-block: 1px 0; // center the content as border is 1px top and 2px bottom
padding-inline: var(--button-padding);
min-height: var(--button-inner-size);
min-width: var(--button-inner-size);
min-height: var(--button-size);
min-width: var(--button-size);
// display setup
display: flex;
align-items: center;
Expand Down Expand Up @@ -808,6 +808,7 @@ function onClick(event: MouseEvent) {
}

&__icon {
--default-clickable-area: var(--button-inner-size); // align icon size with inner button size
height: var(--button-inner-size);
width: var(--button-inner-size);
min-height: var(--button-inner-size);
Expand Down Expand Up @@ -848,7 +849,7 @@ function onClick(event: MouseEvent) {

// Icon-only button
&:has(#{&}__text:empty) {
--button-padding: clamp(var(--default-grid-baseline), var(--button-radius), calc(var(--default-grid-baseline) * 4));
--button-padding: var(--button-radius);
line-height: 1;
width: var(--button-size) !important;
}
Expand Down Expand Up @@ -938,7 +939,7 @@ function onClick(event: MouseEvent) {
&--success {
border-color: var(--color-success-hover);
background-color: var(--color-success);
color: white;
color: var(--color-success-text);
&:hover:not(:disabled) {
background-color: var(--color-success-hover);
}
Expand All @@ -953,7 +954,7 @@ function onClick(event: MouseEvent) {
&--warning {
border-color: var(--color-warning-hover);
background-color: var(--color-warning);
color: white;
color: var(--color-warning-text);
&:hover:not(:disabled) {
background-color: var(--color-warning-hover);
}
Expand All @@ -968,7 +969,7 @@ function onClick(event: MouseEvent) {
&--error {
border-color: var(--color-error-hover);
background-color: var(--color-error);
color: white;
color: var(--color-error-text);
&:hover:not(:disabled) {
background-color: var(--color-error-hover);
}
Expand Down
16 changes: 8 additions & 8 deletions src/components/NcNoteCard/NcNoteCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,23 +171,23 @@ const iconPath = computed(() => {
}

&--success {
--note-background: rgba(var(--color-success-rgb), 0.1);
--note-theme: var(--color-success);
--note-background: var(--color-success);
--note-theme: var(--color-success-text);
}

&--info {
--note-background: rgba(var(--color-info-rgb), 0.1);
--note-theme: var(--color-info);
--note-background: var(--color-info);
--note-theme: var(--color-info-text);
}

&--error {
--note-background: rgba(var(--color-error-rgb), 0.1);
--note-theme: var(--color-error);
--note-background: var(--color-error);
--note-theme: var(--color-error-text);
}

&--warning {
--note-background: rgba(var(--color-warning-rgb), 0.1);
--note-theme: var(--color-warning);
--note-background: var(--color-warning);
--note-theme: var(--color-warning-text);
}
}
</style>
2 changes: 1 addition & 1 deletion src/components/NcSavingIndicatorIcon/NcSavingIndicatorIcon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ defineEmits<{

const indicatorColor = computed(() => {
if (props.error) {
return 'var(--color-error)'
return 'var(--color-error-text)'
}
if (props.saving) {
return 'var(--color-primary-element)'
Expand Down
4 changes: 2 additions & 2 deletions src/components/NcTextArea/NcTextArea.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,14 +315,14 @@ function select() {
}

&--success {
border-color: var(--color-success) !important; //Override hover border color
border-color: var(--color-success-text) !important; //Override hover border color
&:focus-visible {
box-shadow: rgb(248, 250, 252) 0px 0px 0px 2px, var(--color-primary-element) 0px 0px 0px 4px, rgba(0, 0, 0, 0.05) 0px 1px 2px 0px
}
}

&--error {
border-color: var(--color-error) !important; //Override hover border color
border-color: var(--color-error-text) !important; //Override hover border color
&:focus-visible {
box-shadow: rgb(248, 250, 252) 0px 0px 0px 2px, var(--color-primary-element) 0px 0px 0px 4px, rgba(0, 0, 0, 0.05) 0px 1px 2px 0px
}
Expand Down
Loading