diff --git a/webapp/packages/core-blocks/package.json b/webapp/packages/core-blocks/package.json index c33a2b3172..a00aa4d2cb 100644 --- a/webapp/packages/core-blocks/package.json +++ b/webapp/packages/core-blocks/package.json @@ -34,7 +34,6 @@ "@cloudbeaver/core-sdk": "workspace:*", "@cloudbeaver/core-theming": "workspace:*", "@cloudbeaver/core-utils": "workspace:*", - "@cloudbeaver/plugin-tailwindcss-theme": "workspace:*", "@dbeaver/js-helpers": "workspace:*", "@dbeaver/ui-kit": "workspace:*", "go-split": "^3", diff --git a/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionMark.module.css b/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionMark.module.css index ec6a28a22c..56532ec8a3 100644 --- a/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionMark.module.css +++ b/webapp/packages/core-blocks/src/ConnectionImageWithMask/ConnectionMark.module.css @@ -5,8 +5,6 @@ * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - .status { composes: theme-background-positive from global; position: absolute; diff --git a/webapp/packages/core-blocks/src/Expand/Expandable.css b/webapp/packages/core-blocks/src/Expand/Expandable.css index ffd4ec2c14..af2edc93eb 100644 --- a/webapp/packages/core-blocks/src/Expand/Expandable.css +++ b/webapp/packages/core-blocks/src/Expand/Expandable.css @@ -1,5 +1,3 @@ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - @layer components { .dbv-kit-disclosure__disclosure { --dbv-kit-disclosure-foreground: var(--theme-text-on-surface); diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.module.css b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.module.css index b2726617f4..b782d4bdcd 100644 --- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.module.css +++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - @layer components { .field { --dbv-kit-control-outline-offset: -8px; diff --git a/webapp/packages/core-blocks/src/Loader/Loader.module.css b/webapp/packages/core-blocks/src/Loader/Loader.module.css index 70f6308a5d..687f9e3c75 100644 --- a/webapp/packages/core-blocks/src/Loader/Loader.module.css +++ b/webapp/packages/core-blocks/src/Loader/Loader.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - @layer components { .spinner { --dbv-kit-spinner-stroke-color: var(--theme-primary); diff --git a/webapp/packages/core-blocks/src/SlideDialog/SlideDialog.css b/webapp/packages/core-blocks/src/SlideDialog/SlideDialog.css index e17c507dc4..10bf4e4130 100644 --- a/webapp/packages/core-blocks/src/SlideDialog/SlideDialog.css +++ b/webapp/packages/core-blocks/src/SlideDialog/SlideDialog.css @@ -1,5 +1,3 @@ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - @layer components { .dbv-slide-dialog__overlay { position: absolute; diff --git a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarWrapper.module.css b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarWrapper.module.css index 67c284434b..aa6704dc62 100644 --- a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarWrapper.module.css +++ b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarWrapper.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - .notification { composes: theme-background-surface theme-text-on-surface from global; position: relative; diff --git a/webapp/packages/core-blocks/src/Split/ResizerControls.module.css b/webapp/packages/core-blocks/src/Split/ResizerControls.module.css index bb9a2261af..42ca9b7384 100644 --- a/webapp/packages/core-blocks/src/Split/ResizerControls.module.css +++ b/webapp/packages/core-blocks/src/Split/ResizerControls.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - .resizerControls { composes: theme-background-background theme-text-on-secondary from global; position: relative; diff --git a/webapp/packages/core-blocks/src/Table/TableColumnValue.module.css b/webapp/packages/core-blocks/src/Table/TableColumnValue.module.css index 3ea46ac20e..ffa0276bdc 100644 --- a/webapp/packages/core-blocks/src/Table/TableColumnValue.module.css +++ b/webapp/packages/core-blocks/src/Table/TableColumnValue.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - .cell { position: relative; box-sizing: border-box; diff --git a/webapp/packages/core-blocks/src/Table/TableItemExpand.module.css b/webapp/packages/core-blocks/src/Table/TableItemExpand.module.css index dbc3246d92..f643dc9781 100644 --- a/webapp/packages/core-blocks/src/Table/TableItemExpand.module.css +++ b/webapp/packages/core-blocks/src/Table/TableItemExpand.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - .tableItemExpandBoxIcon { width: 16px; height: 16px; diff --git a/webapp/packages/core-blocks/src/Table/TableItemGroupExpand.module.css b/webapp/packages/core-blocks/src/Table/TableItemGroupExpand.module.css index 7f1228f677..f6ef3d5b01 100644 --- a/webapp/packages/core-blocks/src/Table/TableItemGroupExpand.module.css +++ b/webapp/packages/core-blocks/src/Table/TableItemGroupExpand.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - .box { display: inline-block; width: 16px; diff --git a/webapp/packages/core-blocks/tsconfig.json b/webapp/packages/core-blocks/tsconfig.json index 4477816946..07e4ab94b5 100644 --- a/webapp/packages/core-blocks/tsconfig.json +++ b/webapp/packages/core-blocks/tsconfig.json @@ -55,9 +55,6 @@ { "path": "../core-utils" }, - { - "path": "../plugin-tailwindcss-theme" - }, { "path": "../tests-runner" } diff --git a/webapp/packages/core-theming/src/styles/main/app-loading-screen.pure.css b/webapp/packages/core-theming/src/styles/main/app-loading-screen.pure.css index 9625ca56b5..774e41e819 100644 --- a/webapp/packages/core-theming/src/styles/main/app-loading-screen.pure.css +++ b/webapp/packages/core-theming/src/styles/main/app-loading-screen.pure.css @@ -1,5 +1,3 @@ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - #app-loading-screen { z-index: 999; position: absolute; diff --git a/webapp/packages/plugin-codemirror6/src/theme/base-code-editor.css b/webapp/packages/plugin-codemirror6/src/theme/base-code-editor.css index 429cfe240a..1cbf02a625 100644 --- a/webapp/packages/plugin-codemirror6/src/theme/base-code-editor.css +++ b/webapp/packages/plugin-codemirror6/src/theme/base-code-editor.css @@ -1,5 +1,4 @@ @import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - /* Increase specificity by selector repetition */ .editor.editor, .cm-editor.cm-editor, @@ -326,4 +325,3 @@ background-color: unset; } } - diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableError.module.css b/webapp/packages/plugin-data-viewer/src/TableViewer/TableError.module.css index a19c40cdbc..03bfe940e7 100644 --- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableError.module.css +++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableError.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - .error { composes: theme-background-surface theme-text-on-surface from global; position: absolute; diff --git a/webapp/packages/plugin-holidays/src/HolidayActionButton.module.css b/webapp/packages/plugin-holidays/src/HolidayActionButton.module.css index 29e2d637af..b7510fddd4 100644 --- a/webapp/packages/plugin-holidays/src/HolidayActionButton.module.css +++ b/webapp/packages/plugin-holidays/src/HolidayActionButton.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - button.holidayButton { height: 48px; width: 48px; diff --git a/webapp/packages/plugin-navigation-tree-rm/src/Tree/ProjectsRenderer/NavigationNodeProjectControl.module.css b/webapp/packages/plugin-navigation-tree-rm/src/Tree/ProjectsRenderer/NavigationNodeProjectControl.module.css index a37b144a57..82b7e94a39 100644 --- a/webapp/packages/plugin-navigation-tree-rm/src/Tree/ProjectsRenderer/NavigationNodeProjectControl.module.css +++ b/webapp/packages/plugin-navigation-tree-rm/src/Tree/ProjectsRenderer/NavigationNodeProjectControl.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - .treeNodeControl { transition: opacity var(--duration-slow) var(--ease-soft); opacity: 1; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsIconButton.module.css b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsIconButton.module.css index a5e2febfd7..fefa5f77a2 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsIconButton.module.css +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsIconButton.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - .iconButton { & .icon, & .staticImage { diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeControlRenderer.module.css b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeControlRenderer.module.css index a413fb34d1..3189ca03b6 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeControlRenderer.module.css +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeControlRenderer.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - .control { transition: opacity var(--duration-slow) var(--ease-soft); opacity: 1; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/NavigationNodeProjectControl.module.css b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/NavigationNodeProjectControl.module.css index a37b144a57..82b7e94a39 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/NavigationNodeProjectControl.module.css +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/NavigationNodeProjectControl.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - .treeNodeControl { transition: opacity var(--duration-slow) var(--ease-soft); opacity: 1; diff --git a/webapp/packages/plugin-set-common/package.json b/webapp/packages/plugin-set-common/package.json index ffc1c0c0ef..df2262d75e 100644 --- a/webapp/packages/plugin-set-common/package.json +++ b/webapp/packages/plugin-set-common/package.json @@ -116,7 +116,6 @@ "@cloudbeaver/plugin-sql-editor-screen": "workspace:*", "@cloudbeaver/plugin-sql-generator": "workspace:*", "@cloudbeaver/plugin-system-information-administration": "workspace:*", - "@cloudbeaver/plugin-tailwindcss-theme": "workspace:*", "@cloudbeaver/plugin-task-manager": "workspace:*", "@cloudbeaver/plugin-theme": "workspace:*", "@cloudbeaver/plugin-tools-panel": "workspace:*", diff --git a/webapp/packages/plugin-set-common/src/index.ts b/webapp/packages/plugin-set-common/src/index.ts index 5a14fa4ce2..b493f11bb3 100644 --- a/webapp/packages/plugin-set-common/src/index.ts +++ b/webapp/packages/plugin-set-common/src/index.ts @@ -94,7 +94,6 @@ import pluginSqlEditorNew from '@cloudbeaver/plugin-sql-editor-new/module'; import pluginSqlEditorScreen from '@cloudbeaver/plugin-sql-editor-screen/module'; import pluginSqlGenerator from '@cloudbeaver/plugin-sql-generator/module'; import pluginTaskManager from '@cloudbeaver/plugin-task-manager/module'; -import pluginTailwindcssTheme from '@cloudbeaver/plugin-tailwindcss-theme/module'; import pluginTheme from '@cloudbeaver/plugin-theme/module'; import pluginToolsPanel from '@cloudbeaver/plugin-tools-panel/module'; import pluginTopAppBar from '@cloudbeaver/plugin-top-app-bar/module'; @@ -159,7 +158,6 @@ export const commonSet = [ pluginDataGrid, pluginAuthentication, pluginAuthenticationAdministration, - pluginTailwindcssTheme, pluginTheme, pluginLocalization, pluginConnectionCustom, diff --git a/webapp/packages/plugin-set-common/tsconfig.json b/webapp/packages/plugin-set-common/tsconfig.json index 8a56c51056..2c341834f0 100644 --- a/webapp/packages/plugin-set-common/tsconfig.json +++ b/webapp/packages/plugin-set-common/tsconfig.json @@ -292,9 +292,6 @@ { "path": "../plugin-system-information-administration" }, - { - "path": "../plugin-tailwindcss-theme" - }, { "path": "../plugin-task-manager" }, diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/Expand.module.css b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/Expand.module.css index 6216f26bad..be27d1e84e 100644 --- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/Expand.module.css +++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/Expand.module.css @@ -6,8 +6,6 @@ * you may not use this file except in compliance with the License. */ -@import '@cloudbeaver/plugin-tailwindcss-theme/tailwind.css'; - .icon { composes: theme-text-on-surface from global; width: 100%; diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 34cb18dc22..0fa0e11e24 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1464,7 +1464,6 @@ __metadata: "@cloudbeaver/core-sdk": "workspace:*" "@cloudbeaver/core-theming": "workspace:*" "@cloudbeaver/core-utils": "workspace:*" - "@cloudbeaver/plugin-tailwindcss-theme": "workspace:*" "@cloudbeaver/tests-runner": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" @@ -3952,7 +3951,6 @@ __metadata: "@cloudbeaver/plugin-sql-editor-screen": "workspace:*" "@cloudbeaver/plugin-sql-generator": "workspace:*" "@cloudbeaver/plugin-system-information-administration": "workspace:*" - "@cloudbeaver/plugin-tailwindcss-theme": "workspace:*" "@cloudbeaver/plugin-task-manager": "workspace:*" "@cloudbeaver/plugin-theme": "workspace:*" "@cloudbeaver/plugin-tools-panel": "workspace:*"