diff --git a/apps/mix-cms/src/index.html b/apps/mix-cms/src/index.html
index 4aa52db1..7ae664ee 100644
--- a/apps/mix-cms/src/index.html
+++ b/apps/mix-cms/src/index.html
@@ -10,6 +10,7 @@
href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/2.3.1/css/flag-icon.min.css"
rel="stylesheet"
/>
+
diff --git a/apps/mix-database/src/index.html b/apps/mix-database/src/index.html
index 895cd443..c63a14fd 100644
--- a/apps/mix-database/src/index.html
+++ b/apps/mix-database/src/index.html
@@ -6,20 +6,11 @@
-
-
-
+
diff --git a/apps/mix-kanban/src/index.html b/apps/mix-kanban/src/index.html
index cce861da..cae2b798 100644
--- a/apps/mix-kanban/src/index.html
+++ b/apps/mix-kanban/src/index.html
@@ -1,3 +1,4 @@
+
@@ -11,6 +12,7 @@
href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/2.3.1/css/flag-icon.min.css"
rel="stylesheet"
/>
+
diff --git a/libs/mix-lib/src/model/core/database.model.ts b/libs/mix-lib/src/model/core/database.model.ts
index 5a7e8541..2abd9299 100644
--- a/libs/mix-lib/src/model/core/database.model.ts
+++ b/libs/mix-lib/src/model/core/database.model.ts
@@ -421,3 +421,27 @@ export const DatabaseProviderDisplay: Record<
[DatabaseProvider.PostgreSQL]: 'Postgres Sql',
[DatabaseProvider.SQLITE]: 'Sql Lite',
};
+
+export const DataTypeToAgCellEditor = (dataType: DataType) => {
+ switch (dataType) {
+ case DataType.Text:
+ case DataType.Icon:
+ case DataType.ImageUrl:
+ case DataType.VideoYoutube:
+ case DataType.Url:
+ case DataType.Password:
+ return 'agTextCellEditor';
+ case DataType.Integer:
+ case DataType.Double:
+ case DataType.Duration:
+ return 'agNumberCellEditor';
+ case DataType.Date:
+ return 'agDateCellEditor';
+ case DataType.DateTime:
+ return 'agDateCellEditor';
+ case DataType.MultilineText:
+ return 'agLargeTextCellEditor';
+ default:
+ return 'agTextCellEditor';
+ }
+};
diff --git a/libs/mix-share/src/components/main-side-menu/main-side-menu.component.scss b/libs/mix-share/src/components/main-side-menu/main-side-menu.component.scss
index e2952789..77ac6027 100644
--- a/libs/mix-share/src/components/main-side-menu/main-side-menu.component.scss
+++ b/libs/mix-share/src/components/main-side-menu/main-side-menu.component.scss
@@ -91,6 +91,10 @@
&:hover {
opacity: 0.8;
+
+ .mix-icon {
+ font-variation-settings: 'FILL' 1, 'wght' 400, 'GRAD' 0, 'opsz' 24;
+ }
}
&:first-of-type {
@@ -126,6 +130,12 @@
&.--active,
&:hover {
background-color: var(--menu-active-color);
+
+ .side-menu__parent-container {
+ .mix-icon {
+ font-variation-settings: 'FILL' 1, 'wght' 400, 'GRAD' 0, 'opsz' 24;
+ }
+ }
}
&.--route-active {
diff --git a/libs/mix-share/src/modules/database/database-data/database-data.component.ts b/libs/mix-share/src/modules/database/database-data/database-data.component.ts
index da4a38fe..dd7f0ef1 100644
--- a/libs/mix-share/src/modules/database/database-data/database-data.component.ts
+++ b/libs/mix-share/src/modules/database/database-data/database-data.component.ts
@@ -8,7 +8,12 @@ import {
} from '@angular/core';
import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';
-import { MixDatabase, MixDynamicData, MixFilter } from '@mixcore/lib/model';
+import {
+ DataTypeToAgCellEditor,
+ MixDatabase,
+ MixDynamicData,
+ MixFilter,
+} from '@mixcore/lib/model';
import { MixApiFacadeService } from '@mixcore/share/api';
import {
BasicMixFilterComponent,
@@ -181,6 +186,7 @@ export class DatabaseDataComponent
dataType: x.dataType,
columnType: 'value',
},
+ cellEditor: DataTypeToAgCellEditor(x.dataType),
}
);
this.columnNames = s.db.columns.map((x) => x.displayName);
diff --git a/libs/share-styles/src/styles/material-symbol.scss b/libs/share-styles/src/styles/material-symbol.scss
index 2fb38bb4..3aacc400 100644
--- a/libs/share-styles/src/styles/material-symbol.scss
+++ b/libs/share-styles/src/styles/material-symbol.scss
@@ -1,18 +1,3 @@
-/* fallback */
-@font-face {
- font-family: 'Material Symbols Outlined';
- font-style: normal;
- font-weight: 400;
- src: url('./fonts/mat-symbol-400.woff2') format('woff2');
-}
-
-@font-face {
- font-family: 'Material Symbols Outlined';
- font-style: normal;
- font-weight: 200;
- src: url('./fonts/mat-symbol-200.woff2') format('woff2');
-}
-
.material-symbols-outlined {
font-family: 'Material Symbols Outlined';
font-weight: normal;
@@ -43,4 +28,5 @@
direction: ltr;
-webkit-font-feature-settings: 'liga';
-webkit-font-smoothing: antialiased;
+ font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 24;
}
diff --git a/libs/share-styles/src/styles/tippy.scss b/libs/share-styles/src/styles/tippy.scss
index a67075ce..341ae091 100644
--- a/libs/share-styles/src/styles/tippy.scss
+++ b/libs/share-styles/src/styles/tippy.scss
@@ -46,8 +46,16 @@
align-items: center;
gap: 6px;
+ .mix-icon {
+ @apply text-gray-900;
+ }
+
&:hover {
background-color: var(--tui-base-02);
+
+ .mix-icon {
+ font-variation-settings: 'FILL' 1, 'wght' 400, 'GRAD' 0, 'opsz' 24;
+ }
}
}