resolve merging conflicts

This commit is contained in:
flisowna
2022-12-19 14:45:57 +03:00
303 changed files with 12265 additions and 2553 deletions

View File

@@ -1,5 +1,5 @@
import { ViewTypes } from 'nocodb-sdk'
import { themeV2Colors } from '~/utils'
import { themeV2Colors } from '#imports'
import MdiGridIcon from '~icons/mdi/grid-large'
import MdiFormIcon from '~icons/mdi/form-select'
@@ -40,3 +40,13 @@ export function applyLanguageDirection(dir: typeof rtl | typeof ltr) {
document.body.classList.add(dir)
document.body.style.direction = dir
}
export function applyNonSelectable() {
document.body.classList.add('non-selectable')
}
export const getViewIcon = (key?: string | number) => {
if (!key) return
return viewIcons[key]
}