Skip to content

Commit 24b79aa

Browse files
authored
Merge pull request #54512 from nextcloud/chore/adjust-for-new-status-colors
fix: adjust server styles for new secondary status colors
2 parents 8a2b02a + 450c977 commit 24b79aa

File tree

56 files changed

+70
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+70
-68
lines changed

apps/federatedfilesharing/src/components/PersonalSettings.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
:trailing-button-label="copyLinkTooltip"
1717
@trailing-button-click="copyCloudId">
1818
<template #trailing-button-icon>
19-
<IconCheck v-if="isCopied" :size="20" fill-color="var(--color-success)" />
19+
<IconCheck v-if="isCopied" :size="20" fill-color="var(--color-border-success)" />
2020
<IconClipboard v-else :size="20" />
2121
</template>
2222
</NcInputField>

apps/files/src/components/FileEntry/FileEntryActions.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ main.app-content[style*="mouse-pos-x"] .v-popper__popper {
391391
392392
&.files-list__row-action--destructive {
393393
::deep(button) {
394-
color: var(--color-error) !important;
394+
color: var(--color-text-error) !important;
395395
}
396396
}
397397
}

apps/files/src/components/FilesListVirtual.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -853,8 +853,8 @@ export default defineComponent({
853853
854854
&:invalid {
855855
// Show red border on invalid input
856-
border-color: var(--color-error);
857-
color: red;
856+
border-color: var(--color-border-error);
857+
color: var(--color-text-error);
858858
}
859859
}
860860
}

apps/files_sharing/src/components/SharingEntryInternal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ export default {
127127
}
128128
.icon-checkmark-color {
129129
opacity: 1;
130-
color: var(--color-success);
130+
color: var(--color-border-success);
131131
}
132132
}
133133
</style>

apps/settings/css/settings.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/css/settings.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/css/settings.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -819,11 +819,11 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
819819
}
820820

821821
.errors, .errors a {
822-
color: var(--color-error);
822+
color: var(--color-text-error);
823823
}
824824

825825
.warnings, .warnings a {
826-
color: var(--color-warning);
826+
color: var(--color-warning-text);
827827
}
828828

829829
.hint {

apps/settings/src/components/AppList/AppLevelBadge.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ const badgeTitle = computed(() => isSupported.value
4949
width: fit-content;
5050
5151
&--supported {
52-
border-color: var(--color-success);
53-
color: var(--color-success);
52+
background-color: var(--color-success);
53+
border-color: var(--color-border-success);
54+
color: var(--color-success-text);
5455
}
5556
}
5657
</style>

apps/settings/src/components/AppStoreSidebar/AppDetailsTab.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,15 +475,15 @@ export default {
475475
}
476476
477477
.force {
478-
color: var(--color-error);
479-
border-color: var(--color-error);
478+
color: var(--color-text-error);
479+
border-color: var(--color-border-error);
480480
background: var(--color-main-background);
481481
}
482482
483483
.force:hover,
484484
.force:active {
485485
color: var(--color-main-background);
486-
border-color: var(--color-error) !important;
486+
border-color: var(--color-border-error) !important;
487487
background: var(--color-error);
488488
}
489489

apps/settings/src/components/PersonalInfo/shared/AccountPropertySection.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ section {
223223
}
224224
225225
&--error {
226-
color: var(--color-error);
226+
color: var(--color-text-error);
227227
}
228228
}
229229

0 commit comments

Comments
 (0)