Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
:trailing-button-label="copyLinkTooltip"
@trailing-button-click="copyCloudId">
<template #trailing-button-icon>
<IconCheck v-if="isCopied" :size="20" fill-color="var(--color-success)" />
<IconCheck v-if="isCopied" :size="20" fill-color="var(--color-border-success)" />
<IconClipboard v-else :size="20" />
</template>
</NcInputField>
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/components/FileEntry/FileEntryActions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ main.app-content[style*="mouse-pos-x"] .v-popper__popper {

&.files-list__row-action--destructive {
::deep(button) {
color: var(--color-error) !important;
color: var(--color-text-error) !important;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions apps/files/src/components/FilesListVirtual.vue
Original file line number Diff line number Diff line change
Expand Up @@ -853,8 +853,8 @@ export default defineComponent({

&:invalid {
// Show red border on invalid input
border-color: var(--color-error);
color: red;
border-color: var(--color-border-error);
color: var(--color-text-error);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export default {
}
.icon-checkmark-color {
opacity: 1;
color: var(--color-success);
color: var(--color-border-success);
}
}
</style>
4 changes: 2 additions & 2 deletions apps/settings/css/settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -819,11 +819,11 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
}

.errors, .errors a {
color: var(--color-error);
color: var(--color-text-error);
}

.warnings, .warnings a {
color: var(--color-warning);
color: var(--color-warning-text);
}

.hint {
Expand Down
5 changes: 3 additions & 2 deletions apps/settings/src/components/AppList/AppLevelBadge.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ const badgeTitle = computed(() => isSupported.value
width: fit-content;

&--supported {
border-color: var(--color-success);
color: var(--color-success);
background-color: var(--color-success);
border-color: var(--color-border-success);
color: var(--color-success-text);
}
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -475,15 +475,15 @@ export default {
}
.force {
color: var(--color-error);
border-color: var(--color-error);
color: var(--color-text-error);
border-color: var(--color-border-error);
background: var(--color-main-background);
}
.force:hover,
.force:active {
color: var(--color-main-background);
border-color: var(--color-error) !important;
border-color: var(--color-border-error) !important;
background: var(--color-error);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ section {
}

&--error {
color: var(--color-error);
color: var(--color-text-error);
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/systemtags/src/components/SystemTagPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
:name="t('systemtags', 'Applying tags changes…')">
<template #icon>
<NcLoadingIcon v-if="status === Status.LOADING" />
<CheckIcon v-else fill-color="var(--color-success)" />
<CheckIcon v-else fill-color="var(--color-border-success)" />
</template>
</NcEmptyContent>

Expand Down
3 changes: 2 additions & 1 deletion apps/theming/src/components/ItemPreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@ export default {
}

&-warning {
color: var(--color-warning);
background-color: var(--color-warning);
color: var(--color-warning-text);
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/workflowengine/src/components/Check.vue
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,6 @@ export default {
}

.invalid {
border-color: var(--color-error) !important;
border-color: var(--color-border-error) !important;
}
</style>
4 changes: 2 additions & 2 deletions core/css/inputs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ input[type='reset'] {

&.error {
background-color: var(--color-error) !important;
border-color: var(--color-error) !important;
border-color: var(--color-norder-error) !important;
color: var(--color-error-text) !important;
&:hover{
background-color: var(--color-error-hover) !important;
Expand Down Expand Up @@ -384,7 +384,7 @@ input[type='email'] {
&:not(:active):not(:hover):not(:focus){
&:invalid {
+ .icon-confirm {
border-color: var(--color-error-text);
border-color: var(--color-border-error);
}
}
+ .icon-confirm {
Expand Down
6 changes: 3 additions & 3 deletions core/css/toast.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@
}

.toast-error {
border-inline-start: 3px solid var(--color-error-text);
border-inline-start: 3px solid var(--color-border-error);
}

.toast-info {
border-inline-start: 3px solid var(--color-primary-element);
}

.toast-warning {
border-inline-start: 3px solid var(--color-warning);
border-inline-start: 3px solid var(--color-warning-hover);
}

.toast-success {
border-inline-start: 3px solid var(--color-success);
border-inline-start: 3px solid var(--color-border-success);
}
2 changes: 1 addition & 1 deletion core/src/components/AppMenuIcon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ $unread-indicator-size: 10px;
}

&__unread {
color: var(--color-error);
color: var(--color-text-error);
position: absolute;
// Align the dot to the top right corner of the icon
inset-block-end: calc($icon-size + ($unread-indicator-size / -2));
Expand Down
Loading