Browse Source

Merge pull request #3440 from nocodb/enhancement/project-theme-colors

enhancement(gui-v2): provide new set of project theme colors
pull/3442/head
navi 2 years ago committed by GitHub
parent
commit
b01462497f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      packages/nc-gui-v2/components/general/ColorPicker.vue
  2. 6
      packages/nc-gui-v2/pages/[projectType]/[projectId]/index.vue
  3. 2
      packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index/index.vue
  4. 5
      packages/nc-gui-v2/pages/index/index/index.vue
  5. 21
      packages/nc-gui-v2/utils/colorsUtils.ts

4
packages/nc-gui-v2/components/general/ColorPicker.vue

@ -87,8 +87,8 @@ watch(picked, (n, _o) => {
}
.color-selector {
position: relative;
height: 32px;
width: 32px;
height: 25px;
width: 25px;
margin: 10px 5px;
border-radius: 5px;
-webkit-text-stroke-width: 1px;

6
packages/nc-gui-v2/pages/[projectType]/[projectId]/index.vue

@ -5,10 +5,10 @@ import tinycolor from 'tinycolor2'
import {
computed,
definePageMeta,
enumColor,
navigateTo,
onKeyStroke,
openLink,
projectThemeColors,
provide,
provideSidebar,
ref,
@ -279,8 +279,8 @@ const copyAuthToken = async () => {
<GeneralColorPicker
v-model="themePrimaryColor"
:colors="enumColor.dark"
:row-size="5"
:colors="projectThemeColors"
:row-size="9"
:advanced="false"
/>
<a-sub-menu key="theme-2">

2
packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index/index.vue

@ -61,7 +61,7 @@ function onDrop(droppedFiles: File[] | null) {
if (isAllowed) {
const ext = droppedFiles[0].name.split('.').pop()
fileType = (ext === 'csv' || ext === 'json') ? ext : 'excel' as QuickImportTypes
fileType = ext === 'csv' || ext === 'json' ? ext : ('excel' as QuickImportTypes)
}
return isAllowed

5
packages/nc-gui-v2/pages/index/index/index.vue

@ -8,6 +8,7 @@ import {
definePageMeta,
extractSdkResponseErrorMsg,
navigateTo,
projectThemeColors,
ref,
useApi,
useNuxtApp,
@ -226,8 +227,8 @@ watch(themePrimaryColors, async (nextColors) => {
<GeneralColorPicker
v-model="themePrimaryColors[record.id]"
:colors="enumColor.dark"
:row-size="5"
:colors="projectThemeColors"
:row-size="9"
:advanced="false"
/>
<a-sub-menu key="pick-primary">

21
packages/nc-gui-v2/utils/colorsUtils.ts

@ -83,3 +83,24 @@ export const hexToRGB = (hex: string) => {
return `${r}, ${g}, ${b}`
}
export const projectThemeColors = [
'#2D7FF9',
'#18BFFF',
'#60DAD5',
'#EC2CBD',
'#F82B60',
'#F57134',
'#1BAF2C',
'#8B46FF',
'#666666',
'#1B51A2',
'#146C8E',
'#24716E',
'#8A2170',
'#941737',
'#B94915',
'#0E4C15',
'#381475',
'#333333',
]

Loading…
Cancel
Save