Skip to content

Commit c4698b3

Browse files
authored
Merge branch '10.0-release' into alejandro/fix/update-terminal-error-for-non-migrated-config
2 parents d3fb3e6 + 7c55c33 commit c4698b3

File tree

5 files changed

+6
-19
lines changed

5 files changed

+6
-19
lines changed

packages/app/cypress/e2e/settings.cy.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ describe('App: Settings', () => {
246246
cy.get('[data-cy="config-legend"]').within(() => {
247247
cy.get('.bg-gray-50').contains('default')
248248
cy.get('.bg-teal-100').contains('config')
249-
cy.get('.bg-yellow-100').contains('env')
249+
cy.get('.bg-orange-100').contains('env')
250250
cy.get('.bg-red-50').contains('cli')
251251
})
252252

@@ -289,7 +289,7 @@ describe('App: Settings', () => {
289289
cy.get('[data-cy="config-legend"]').within(() => {
290290
cy.get('.bg-gray-50').contains('default')
291291
cy.get('.bg-teal-100').contains('config')
292-
cy.get('.bg-yellow-100').contains('env')
292+
cy.get('.bg-orange-100').contains('env')
293293
cy.get('.bg-red-50').contains('cli')
294294
})
295295

packages/app/src/settings/project/ConfigBadge.cy.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('<ConfigBadge />', () => {
1414
cy.mount(() => (
1515
<div class="p-12 children:pb-4">
1616
<ConfigBadge label="Superb" class="bg-gray-100 text-gray-600">This is a pretty <pre class="inline">great</pre> badge</ConfigBadge>
17-
<ConfigBadge label="Sub-par" class="bg-yellow-100 text-yellow-600">A warning would probably go here</ConfigBadge>
17+
<ConfigBadge label="Sub-par" class="bg-orange-100 text-orange-600">A warning would probably go here</ConfigBadge>
1818
<ConfigBadge label="So cool" class="bg-indigo-100 text-indigo-600">Populated by lorem ipsum</ConfigBadge>
1919
<ConfigBadge label="...Super?" class="bg-rose-100 text-rose-600">...is <a>this</a> expected?</ConfigBadge>
2020
</div>
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export const CONFIG_LEGEND_COLOR_MAP = {
22
default: 'text-gray-800 bg-gray-50',
33
config: 'bg-teal-100 text-teal-700',
4-
env: 'bg-yellow-100 text-yellow-700',
4+
env: 'bg-orange-100 text-orange-700',
55
cli: 'bg-red-50 text-red-700',
66
plugin: 'bg-purple-50 text-purple-700',
77
} as const

packages/frontend-shared/.windicss/colors.ts

-13
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,6 @@ const customColors = {
9494
900: '#320E58',
9595
1000: '#2F0C52',
9696
},
97-
yellow: {
98-
50: '#F7F4D2',
99-
100: '#ECE6A9',
100-
200: '#E1D984',
101-
300: '#CBBE41',
102-
400: '#A18E00',
103-
500: '#7E6A00',
104-
600: '#644D00',
105-
700: '#523800',
106-
800: '#452900',
107-
900: '#3D1E00',
108-
1000: '#391800',
109-
},
11097
green: {
11198
50: '#F5F5D0',
11299
100: '#E7E8AB',

packages/frontend-shared/src/gql-components/topnav/TopNav.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</TopNavListItem>
5454

5555
<TopNavListItem
56-
class="bg-yellow-50 py-8px px-16px"
56+
class="bg-orange-50 py-8px px-16px"
5757
data-cy="current-hint"
5858
>
5959
<div class="whitespace-nowrap">
@@ -68,7 +68,7 @@
6868
<span class="text-gray-600 text-14px">{{ t('topNav.released') }} {{ versions.current.released }}</span>
6969
</div>
7070
<template #suffix>
71-
<span class="rounded-md bg-yellow-100">
71+
<span class="rounded-md bg-orange-100">
7272
<span class="p-5px text-amber-800">
7373
{{ t('topNav.installed') }}
7474
</span>

0 commit comments

Comments
 (0)