From 9f9127b0937c21ecd148e35f8bf6f2b6cb3e0d2f Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Thu, 9 Nov 2023 23:00:52 +0200 Subject: [PATCH] Revert to previous red colors but do not use red color for text (#2786) Revert red colors back introduced by #2778 But do not use red color for text on dark background anywhere example: ![attels](https://github.com/woodpecker-ci/woodpecker/assets/165205/39f008fe-3d43-495f-b956-ea5bf4a5fa16) --- web/components.d.ts | 6 +++--- .../admin/settings/AdminInfoTab.vue | 20 ++++++++++--------- web/src/components/atomic/Button.vue | 3 +-- web/src/components/atomic/Error.vue | 17 ++++++++++++++++ web/src/components/atomic/Icon.vue | 4 +++- web/src/components/atomic/Warning.vue | 9 ++++++--- web/src/components/layout/Container.vue | 3 ++- web/src/components/layout/Settings.vue | 2 +- .../components/repo/settings/ActionsTab.vue | 2 ++ web/src/views/Login.vue | 7 +------ web/src/views/repo/pipeline/Pipeline.vue | 8 ++++---- web/windi.config.ts | 8 ++++---- 12 files changed, 55 insertions(+), 34 deletions(-) create mode 100644 web/src/components/atomic/Error.vue diff --git a/web/components.d.ts b/web/components.d.ts index 37a76aec1..778ecc8cf 100644 --- a/web/components.d.ts +++ b/web/components.d.ts @@ -26,17 +26,16 @@ declare module 'vue' { CronTab: typeof import('./src/components/repo/settings/CronTab.vue')['default'] DeployPipelinePopup: typeof import('./src/components/layout/popups/DeployPipelinePopup.vue')['default'] DocsLink: typeof import('./src/components/atomic/DocsLink.vue')['default'] + Error: typeof import('./src/components/atomic/Error.vue')['default'] GeneralTab: typeof import('./src/components/repo/settings/GeneralTab.vue')['default'] Header: typeof import('./src/components/layout/scaffold/Header.vue')['default'] IBiCheckCircleFill: typeof import('~icons/bi/check-circle-fill')['default'] IBiCircle: typeof import('~icons/bi/circle')['default'] - IBiExclamationCircleFill: typeof import('~icons/bi/exclamation-circle-fill')['default'] IBiExclamationTriangle: typeof import('~icons/bi/exclamation-triangle')['default'] IBiExclamationTriangleFill: typeof import('~icons/bi/exclamation-triangle-fill')['default'] IBiPlayCircleFill: typeof import('~icons/bi/play-circle-fill')['default'] IBiSlashCircleFill: typeof import('~icons/bi/slash-circle-fill')['default'] IBiStopCircleFill: typeof import('~icons/bi/stop-circle-fill')['default'] - IBiX: typeof import('~icons/bi/x')['default'] IBiXCircleFill: typeof import('~icons/bi/x-circle-fill')['default'] IBxBxPowerOff: typeof import('~icons/bx/bx-power-off')['default'] ICarbonCloseOutline: typeof import('~icons/carbon/close-outline')['default'] @@ -63,14 +62,15 @@ declare module 'vue' { IMdiBitbucket: typeof import('~icons/mdi/bitbucket')['default'] IMdiChevronRight: typeof import('~icons/mdi/chevron-right')['default'] IMdiClockTimeEightOutline: typeof import('~icons/mdi/clock-time-eight-outline')['default'] + IMdiErrorOutline: typeof import('~icons/mdi/error-outline')['default'] IMdiFormatListBulleted: typeof import('~icons/mdi/format-list-bulleted')['default'] IMdiGestureTap: typeof import('~icons/mdi/gesture-tap')['default'] IMdiGithub: typeof import('~icons/mdi/github')['default'] IMdiLoading: typeof import('~icons/mdi/loading')['default'] + IMdiSync: typeof import('~icons/mdi/sync')['default'] IMdiSourceBranch: typeof import('~icons/mdi/source-branch')['default'] IMdisourceCommit: typeof import('~icons/mdi/source-commit')['default'] IMdiSourcePull: typeof import('~icons/mdi/source-pull')['default'] - IMdiSync: typeof import('~icons/mdi/sync')['default'] IMdiTagOutline: typeof import('~icons/mdi/tag-outline')['default'] InputField: typeof import('./src/components/form/InputField.vue')['default'] IPhGitlabLogoSimpleFill: typeof import('~icons/ph/gitlab-logo-simple-fill')['default'] diff --git a/web/src/components/admin/settings/AdminInfoTab.vue b/web/src/components/admin/settings/AdminInfoTab.vue index 3b774f3a9..22dd6b48b 100644 --- a/web/src/components/admin/settings/AdminInfoTab.vue +++ b/web/src/components/admin/settings/AdminInfoTab.vue @@ -7,15 +7,17 @@ {{ version?.current }} - - {{ version.latest }} - + + + {{ version.latest }} + + diff --git a/web/src/components/atomic/Button.vue b/web/src/components/atomic/Button.vue index dd11dd1ea..db656554d 100644 --- a/web/src/components/atomic/Button.vue +++ b/web/src/components/atomic/Button.vue @@ -8,8 +8,7 @@ color === 'gray', 'bg-wp-control-ok-100 hover:bg-wp-control-ok-200 border-wp-control-ok-300 text-white': color === 'green', 'bg-wp-control-info-100 hover:bg-wp-control-info-200 border-wp-control-info-300 text-white': color === 'blue', - 'bg-wp-control-error-100 hover:bg-wp-control-error-200 border-wp-control-error-300 text-white dark:text-dark-300': - color === 'red', + 'bg-wp-control-error-100 hover:bg-wp-control-error-200 border-wp-control-error-300 text-white': color === 'red', ...passedClasses, }" :title="title" diff --git a/web/src/components/atomic/Error.vue b/web/src/components/atomic/Error.vue new file mode 100644 index 000000000..396168f4d --- /dev/null +++ b/web/src/components/atomic/Error.vue @@ -0,0 +1,17 @@ + + + diff --git a/web/src/components/atomic/Icon.vue b/web/src/components/atomic/Icon.vue index 5fa9fe858..d1b9ba300 100644 --- a/web/src/components/atomic/Icon.vue +++ b/web/src/components/atomic/Icon.vue @@ -24,6 +24,7 @@ + @@ -98,7 +99,8 @@ export type IconNames = | 'play' | 'pause' | 'warning' - | 'attention'; + | 'attention' + | 'error'; defineProps<{ name: IconNames; diff --git a/web/src/components/atomic/Warning.vue b/web/src/components/atomic/Warning.vue index 43384a8dc..418d8b525 100644 --- a/web/src/components/atomic/Warning.vue +++ b/web/src/components/atomic/Warning.vue @@ -1,14 +1,17 @@ diff --git a/web/src/components/layout/Container.vue b/web/src/components/layout/Container.vue index fb03ab262..d2fb4e7cf 100644 --- a/web/src/components/layout/Container.vue +++ b/web/src/components/layout/Container.vue @@ -1,5 +1,5 @@ @@ -7,5 +7,6 @@ diff --git a/web/src/components/layout/Settings.vue b/web/src/components/layout/Settings.vue index 9dbc89ff3..2d187fd9b 100644 --- a/web/src/components/layout/Settings.vue +++ b/web/src/components/layout/Settings.vue @@ -7,7 +7,7 @@ {{ desc }}

- +
diff --git a/web/src/components/repo/settings/ActionsTab.vue b/web/src/components/repo/settings/ActionsTab.vue index 443d84a1f..26b586fb1 100644 --- a/web/src/components/repo/settings/ActionsTab.vue +++ b/web/src/components/repo/settings/ActionsTab.vue @@ -3,6 +3,7 @@