| Name |
-
+
Name
{{ formArray.at(i).get('name')?.errors | errorMessage }}
@@ -21,7 +21,7 @@ NaturalAbstractEditableList
Description |
-
+
Description
{{ formArray.at(i).get('description')?.errors | errorMessage }}
@@ -46,12 +46,12 @@ NaturalAbstractEditableList
@for (element of dataSource.data; track element) {
-
+
Name
{{ formArray.at($index).get('name')?.errors | errorMessage }}
-
+
Description
{{ formArray.at($index).get('description')?.errors | errorMessage }}
diff --git a/src/app/editable-list/editable-list.component.scss b/src/app/editable-list/editable-list.component.scss
index e69de29b..1f580b29 100644
--- a/src/app/editable-list/editable-list.component.scss
+++ b/src/app/editable-list/editable-list.component.scss
@@ -0,0 +1,3 @@
+mat-form-field {
+ margin-block: 2px;
+}
diff --git a/src/app/editor/editor.component.scss b/src/app/editor/editor.component.scss
index 5f41e5f6..0d1ef73a 100644
--- a/src/app/editor/editor.component.scss
+++ b/src/app/editor/editor.component.scss
@@ -1,5 +1,5 @@
.preview {
border-radius: 8px;
- background: rgba(0, 0, 0, 0.1);
+ background-color: var(--mat-sys-surface-container-lowest);
padding: 20px 30px;
}
diff --git a/src/app/file/file.component.scss b/src/app/file/file.component.scss
index 4b235500..a85631fb 100644
--- a/src/app/file/file.component.scss
+++ b/src/app/file/file.component.scss
@@ -1,8 +1,4 @@
-a[naturalFileDrop] {
- border: 1px dashed #a541c1;
-}
-
.natural-file-over {
- border-color: pink;
- background-color: #00b0ff;
+ background-color: var(--mat-sys-secondary-container);
+ color: var(--mat-sys-on-secondary-container);
}
diff --git a/src/app/hierarchic/hierarchic.component.ts b/src/app/hierarchic/hierarchic.component.ts
index a8f31af4..622a28ef 100644
--- a/src/app/hierarchic/hierarchic.component.ts
+++ b/src/app/hierarchic/hierarchic.component.ts
@@ -84,7 +84,9 @@ export class HierarchicComponent {
.afterClosed()
.subscribe((result?: HierarchicDialogResult) => {
console.log('dialog usage', result);
- this.selected = result?.hierarchicSelection ?? {};
+ if (result !== undefined) {
+ this.selected = result.hierarchicSelection ?? {};
+ }
});
}
}
diff --git a/src/app/home/_home.theme.scss b/src/app/home/_home.theme.scss
deleted file mode 100644
index 87939057..00000000
--- a/src/app/home/_home.theme.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-@use 'sass:map';
-@use '@angular/material' as mat;
-
-@mixin home($theme) {
- $primary: map.get($theme, primary);
- $accent: map.get($theme, accent);
- $warn: map.get($theme, warn);
-
- app-home {
- .mat-toolbar {
- background: #212121;
- color: #fff;
- }
-
- #menu {
- border-radius: 4px;
- background: mat.m2-get-color-from-palette($primary);
- background: -moz-linear-gradient(
- bottom,
- mat.m2-get-color-from-palette($primary) 50%,
- mat.m2-get-color-from-palette($accent) 150%
- ); /* FF3.6-15 */
- background: -webkit-linear-gradient(
- bottom,
- mat.m2-get-color-from-palette($primary) 50%,
- mat.m2-get-color-from-palette($accent) 150%
- ); /* Chrome10-25,Safari5.1-6 */
- background: linear-gradient(
- to bottom,
- mat.m2-get-color-from-palette($primary) 50%,
- mat.m2-get-color-from-palette($accent) 150%
- ); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
- }
- }
-}
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index 54682d5e..132701c3 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -1,160 +1,141 @@
-
-
- @if (menu) {
-
- }
-
-
- 
- @ecodev/natural
-
-
-
-
- NaturalAbstractList
|
|
+ |
@@ -41,11 +42,13 @@ NaturalAbstractList
(click)="$event.stopPropagation()"
/>
+ | |
id |
{{ element.id }} |
+ / |
@@ -53,20 +56,13 @@ NaturalAbstractList
|
+ name |
- description |
- {{
- element.description
- }} |
+ description |
+ {{ element.description }} |
+ description |
@@ -81,6 +77,7 @@ NaturalAbstractList
visible but hidden in dropdown |
+ hidden |
@@ -95,6 +92,7 @@ NaturalAbstractList
should never be visible, even if solicited by url
|
+ / |
@@ -114,7 +112,7 @@ NaturalAbstractList
(page)="pagination($event)"
/>
-
+
columnsForTable : {{ columnsForTable | json }}
selectedColumns : {{ selectedColumns | json }}
diff --git a/src/app/list/list.component.ts b/src/app/list/list.component.ts
index 6d3785d5..82e2fc41 100644
--- a/src/app/list/list.component.ts
+++ b/src/app/list/list.component.ts
@@ -15,6 +15,10 @@ import {
MatCell,
MatHeaderRow,
MatRow,
+ MatFooterCell,
+ MatFooterRow,
+ MatFooterCellDef,
+ MatFooterRowDef,
} from '@angular/material/table';
import {AvailableColumn, Button, NaturalAbstractList, Sorting, SortingOrder} from '@ecodev/natural';
import {NaturalColumnsPickerComponent} from '../../../projects/natural/src/lib/modules/columns-picker/columns-picker.component';
@@ -31,12 +35,16 @@ import {ItemService} from '../../../projects/natural/src/lib/testing/item.servic
MatTable,
MatHeaderCellDef,
MatHeaderRowDef,
+ MatFooterCellDef,
+ MatFooterRowDef,
MatColumnDef,
MatCellDef,
MatRowDef,
MatHeaderCell,
+ MatFooterCell,
MatCell,
MatHeaderRow,
+ MatFooterRow,
MatRow,
MatSort,
MatSortHeader,
diff --git a/src/app/relations/relations.component.html b/src/app/relations/relations.component.html
index e12ca4f9..5767d806 100644
--- a/src/app/relations/relations.component.html
+++ b/src/app/relations/relations.component.html
@@ -4,9 +4,9 @@ natural-relations
@if (isUpdatePage()) {
-
-
- Hierarchic selector
+
+
+ Hierarchic selector
natural-relations
(selectionChange)="relationsAdded('Hierarchic selector')"
/>
-
- Service
+
+ Service
natural-relations
(selectionChange)="relationsAdded('Service')"
/>
-
- No result service
+
+ No result service
natural-relations
(selectionChange)="relationsAdded('NoResultService')"
/>
-
- ErrorService
+
+ ErrorService
div {
- natural-relations {
- border-radius: 4px;
- background: rgba(0, 0, 0, 0.1);
- padding: 20px;
- }
- }
-}
diff --git a/src/app/search/search.component.html b/src/app/search/search.component.html
index bebf1ba4..730dc102 100644
--- a/src/app/search/search.component.html
+++ b/src/app/search/search.component.html
@@ -2,7 +2,7 @@ natural-search
(() => (this.isDark() ? 'defaultDark' : 'default'));
-
- public constructor() {
- const theme = this.storage.getItem('theme') as Theme | null;
- this.set(!!theme?.includes('Dark'));
- }
-
- public set(isDark: boolean): void {
- this.isDark.set(isDark);
- this.storage.setItem('theme', this.theme());
- }
-
- public toggle(): void {
- this.set(!this.isDark());
- }
-}
diff --git a/src/app/theme-merger/theme-merger.component.html b/src/app/theme-merger/theme-merger.component.html
new file mode 100644
index 00000000..c545fb6f
--- /dev/null
+++ b/src/app/theme-merger/theme-merger.component.html
@@ -0,0 +1,154 @@
+
+
+
+
+
+
+ Primary
+
+
+
+ Secondary
+
+
+
+ Tertiary
+
+
+
+
+ @if (theme1) {
+
+ arrow_right_alt
+
+
+
+ Theme name
+
+
+
+
+
+
+ } @else {
+
+
+
+ }
+
+
+@if (theme1) {
+
+ @if (showPropertyNames) {
+
+
+ @for (tokenName of getTokenNames(theme1); track $index) {
+ {{ camelToKebab(tokenName) }}
+ }
+
+ }
+
+
+
+
+ Theme 1 - Light
+
+
+
+
+ @for (variation of getVariationsForTheme(1); track variation) {
+
+ }
+
+
+ @for (tokenName of getTokenNames(theme1); track $index) {
+
+ @if (tokenName) {
+ @for (item of getTokensForName(theme1, tokenName); track item.variation) {
+
+ }
+ }
+
+ }
+
+
+
+
+
+ {{ theme2 ? 'Theme 2' : 'Theme 1' }} - Dark
+
+
+
+
+ @if (theme2) {
+
+ }
+
+
+ @for (variation of getVariationsForTheme(2); track variation) {
+
+ }
+
+
+
+ @for (tokenName of getTokenNames(getRightTheme()); track $index) {
+
+ @if (tokenName) {
+ @for (item of getTokensForNameRight(tokenName); track item.variation) {
+
+ }
+ }
+
+ }
+
+ | |