From 04b2b1cc4f207fa4d1d98cac4587525a94b362fb Mon Sep 17 00:00:00 2001 From: pat-s Date: Sat, 23 Nov 2024 16:16:05 +0100 Subject: [PATCH 01/70] improve code highlightings --- web/src/style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/src/style.css b/web/src/style.css index ab6d64be3b0..62e39860c55 100644 --- a/web/src/style.css +++ b/web/src/style.css @@ -41,6 +41,7 @@ --wp-code-100: theme('colors.int-wp-secondary.300'); --wp-code-200: theme('colors.int-wp-secondary.600'); + --wp-code-custom: #f0f1f3; --wp-code-text-100: theme('colors.gray.200'); --wp-code-text-alt-100: theme('colors.gray.300'); @@ -90,6 +91,7 @@ --wp-code-100: theme('colors.int-wp-secondary.700'); --wp-code-200: theme('colors.int-wp-secondary.800'); + --wp-code-custom: #3d444d; --wp-code-text-100: theme('colors.gray.300'); --wp-code-text-alt-100: theme('colors.gray.400'); @@ -149,5 +151,5 @@ body, .code-box-inline, code:not(pre > code) { - @apply bg-wp-code-200 rounded-md text-wp-code-text-100 px-1 py-px; + @apply bg-wp-code-custom rounded-lg text-wp-code-text-100 px-1.5 py-0.5; } From 994b797874d458200ca2439a129b37f3d0526e19 Mon Sep 17 00:00:00 2001 From: pat-s Date: Sun, 1 Dec 2024 20:31:56 +0100 Subject: [PATCH 02/70] consolidate code bg colours --- web/src/components/repo/pipeline/PipelineLog.vue | 4 ++-- web/src/style.css | 10 +++------- web/windi.config.ts | 5 ++--- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/web/src/components/repo/pipeline/PipelineLog.vue b/web/src/components/repo/pipeline/PipelineLog.vue index 124d7ada3e0..a16e223f6c7 100644 --- a/web/src/components/repo/pipeline/PipelineLog.vue +++ b/web/src/components/repo/pipeline/PipelineLog.vue @@ -5,7 +5,7 @@ @mouseover="showActions = true" @mouseleave="showActions = false" > -
+
{{ $t('repo.pipeline.log_title') }} {{ step?.name }} @@ -96,7 +96,7 @@
{{ step.error }} diff --git a/web/src/style.css b/web/src/style.css index 62e39860c55..5da5d3f4b7e 100644 --- a/web/src/style.css +++ b/web/src/style.css @@ -39,9 +39,7 @@ --wp-hint-warn-100: theme('colors.int-wp-hint-warn.100'); --wp-hint-warn-200: theme('colors.int-wp-hint-warn.200'); - --wp-code-100: theme('colors.int-wp-secondary.300'); - --wp-code-200: theme('colors.int-wp-secondary.600'); - --wp-code-custom: #f0f1f3; + --wp-code-bg-100: #f0f1f3; --wp-code-text-100: theme('colors.gray.200'); --wp-code-text-alt-100: theme('colors.gray.300'); @@ -89,9 +87,7 @@ --wp-hint-warn-100: theme('colors.int-wp-hint-warn-dark.100'); --wp-hint-warn-200: theme('colors.int-wp-hint-warn-dark.200'); - --wp-code-100: theme('colors.int-wp-secondary.700'); - --wp-code-200: theme('colors.int-wp-secondary.800'); - --wp-code-custom: #3d444d; + --wp-code-bg-100: #3d444d; --wp-code-text-100: theme('colors.gray.300'); --wp-code-text-alt-100: theme('colors.gray.400'); @@ -145,7 +141,7 @@ body, } .code-box { - @apply bg-wp-code-200 p-4 rounded-md text-wp-code-text-100 text-sm break-words; + @apply bg-wp-code-bg-100 p-4 rounded-md text-wp-code-text-100 text-sm break-words; white-space: pre-wrap; } diff --git a/web/windi.config.ts b/web/windi.config.ts index 51fa05513e2..121ffd8513e 100644 --- a/web/windi.config.ts +++ b/web/windi.config.ts @@ -193,9 +193,8 @@ export default defineConfig({ 200: 'var(--wp-hint-warn-200)', }, - 'wp-code': { - 100: 'var(--wp-code-100)', - 200: 'var(--wp-code-200)', + 'wp-code-bg': { + 100: 'var(--wp-code-bg-100)', }, 'wp-code-text': { 100: 'var(--wp-code-text-100)', From a527b4d4d7c3ed26b8e7b8945e4d241f941aaee9 Mon Sep 17 00:00:00 2001 From: pat-s Date: Wed, 18 Dec 2024 14:18:51 +0100 Subject: [PATCH 03/70] only change code-box-inline bg --- web/src/style.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/src/style.css b/web/src/style.css index 5da5d3f4b7e..86688548041 100644 --- a/web/src/style.css +++ b/web/src/style.css @@ -103,7 +103,7 @@ body, } .vue-notification { - @apply rounded-md text-base border-l-6; + @apply border-l-6 rounded-md text-base; } .vue-notification .notification-title { @@ -129,7 +129,7 @@ body, *::-webkit-scrollbar-thumb { transition: background 0.2s ease-in-out; border: 3px solid transparent; - @apply bg-cool-gray-200 dark:bg-dark-200 rounded-full bg-clip-content; + @apply bg-clip-content bg-cool-gray-200 dark:bg-dark-200 rounded-full; } *::-webkit-scrollbar-thumb:hover { @@ -141,11 +141,11 @@ body, } .code-box { - @apply bg-wp-code-bg-100 p-4 rounded-md text-wp-code-text-100 text-sm break-words; + @apply bg-wp-code-200 p-4 rounded-md text-sm text-wp-code-text-100 break-words; white-space: pre-wrap; } .code-box-inline, code:not(pre > code) { - @apply bg-wp-code-custom rounded-lg text-wp-code-text-100 px-1.5 py-0.5; + @apply bg-wp-code-custom px-1.5 py-0.5 rounded-lg text-wp-code-text-100; } From a19c2f16bd77229889b081a9ebebdc4452c3bb45 Mon Sep 17 00:00:00 2001 From: pat-s Date: Wed, 18 Dec 2024 14:33:57 +0100 Subject: [PATCH 04/70] use wp-code-300 as definition name --- .../components/repo/pipeline/PipelineLog.vue | 26 +++++++++---------- web/src/style.css | 5 ++-- web/windi.config.ts | 7 +++-- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/web/src/components/repo/pipeline/PipelineLog.vue b/web/src/components/repo/pipeline/PipelineLog.vue index a16e223f6c7..575952984c8 100644 --- a/web/src/components/repo/pipeline/PipelineLog.vue +++ b/web/src/components/repo/pipeline/PipelineLog.vue @@ -1,17 +1,17 @@