Browse Source

fix: added maroon color to design system

pull/6595/head
sreehari jayaraj 1 year ago
parent
commit
cb82f0e8c6
  1. 1
      packages/nc-gui/components/nc/Badge.vue
  2. 1
      packages/nc-gui/components/roles/Badge.vue
  3. 3
      packages/nc-gui/utils/iconUtils.ts
  4. 12
      packages/nc-gui/windi.config.ts
  5. 2
      packages/nocodb-sdk/src/lib/enums.ts

1
packages/nc-gui/components/nc/Badge.vue

@ -22,6 +22,7 @@ const props = withDefaults(
'border-orange-500 bg-orange-100': props.color === 'orange',
'border-yellow-500 bg-yellow-100': props.color === 'yellow',
'border-red-500 bg-red-100': props.color === 'red',
'border-maroon-500 bg-maroon-50': props.color === 'maroon',
'border-gray-300': !props.color,
'border-1': props.border,
'h-6': props.size === 'sm',

1
packages/nc-gui/components/roles/Badge.vue

@ -56,6 +56,7 @@ const roleProperties = computed(() => {
'text-orange-700': roleProperties.color === 'orange',
'text-yellow-700': roleProperties.color === 'yellow',
'text-red-700': roleProperties.color === 'red',
'text-maroon-700': roleProperties.color === 'maroon',
'text-gray-300': !roleProperties.color,
sizeSelect,
}"

3
packages/nc-gui/utils/iconUtils.ts

@ -40,7 +40,6 @@ import PlusSquare from '~icons/nc-icons/plus-square'
import MobileShare from '~icons/nc-icons/share'
import PhLayout from '~icons/ph/layout'
import Delete from '~icons/material-symbols/delete-outline-rounded'
import CiFilter from '~icons/mdi/filter-outline'
import Minus from '~icons/material-symbols/remove-rounded'
import Code from '~icons/material-symbols/code-rounded'
import Palette from '~icons/material-symbols/palette-outline'
@ -300,7 +299,6 @@ export const iconMap = {
viewList: h('span', { class: 'material-symbols' }, 'view_list'),
cloud: h('span', { class: 'material-symbols' }, 'cloud'),
apiAndSupport: h('span', { class: 'material-symbols' }, 'api'),
sort: h('span', { class: 'material-symbols', style: { transform: 'scaleY(-1)' } }, 'sort'),
translate: h('span', { class: 'material-symbols' }, 'translate'),
preview: h('span', { class: 'material-symbols' }, 'visibility'),
link: h('span', { class: 'material-symbols' }, 'link'),
@ -416,7 +414,6 @@ export const iconMap = {
view: h('span', { class: 'material-symbols' }, 'visibility'),
// rowHeight: h('span', { class: 'material-symbols' }, 'height'),
rowHeight: h(PhSplitVerticalThin, { style: { fontSize: '14px' } }),
filter: CiFilter,
closeCircle: h('span', { class: 'material-symbols' }, 'cancel'),
closeBox: h('span', { class: 'material-symbols' }, 'close'),
close: MSCloseRounded,

12
packages/nc-gui/windi.config.ts

@ -186,6 +186,18 @@ export default defineConfig({
800: '#654c17',
900: '#32260c',
},
maroon: {
50: '#FFF0F7',
100: '#FFCFE6',
200: '#FFABD2',
300: '#EC7DB1',
400: '#D45892',
500: '#B33771',
600: '#9D255D',
700: '#801044',
800: '#690735',
900: '#42001F',
},
primary: 'rgba(var(--color-primary), var(--tw-bg-opacity))',
accent: 'rgba(var(--color-accent), var(--tw-bg-opacity))',

2
packages/nocodb-sdk/src/lib/enums.ts

@ -188,7 +188,7 @@ export const RoleColors = {
[ProjectRoles.EDITOR]: 'green',
[ProjectRoles.COMMENTER]: 'orange',
[ProjectRoles.VIEWER]: 'yellow',
[OrgUserRoles.SUPER_ADMIN]: 'purple',
[OrgUserRoles.SUPER_ADMIN]: 'maroon',
[ProjectRoles.NO_ACCESS]: 'red',
[OrgUserRoles.CREATOR]: 'blue',
[OrgUserRoles.VIEWER]: 'yellow',

Loading…
Cancel
Save